Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 142404 Details for
Bug 199620
x11-plugins/gkrellmms removal request (does not compile w/ audacious-1.4.x)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patches upstream gkrellmms for use with Audacious-1.4
gkrellmms_audacious_2.patch (text/plain), 32.54 KB, created by
Sascha Hlusiak
on 2008-02-01 14:55:00 UTC
(
hide
)
Description:
Patches upstream gkrellmms for use with Audacious-1.4
Filename:
MIME Type:
Creator:
Sascha Hlusiak
Created:
2008-02-01 14:55:00 UTC
Size:
32.54 KB
patch
obsolete
>diff -Naur ../gkrellmms/gkrellmms.c ./gkrellmms.c >--- ../gkrellmms/gkrellmms.c 2005-01-21 18:02:17.000000000 +0100 >+++ ./gkrellmms.c 2008-02-01 15:47:48.000000000 +0100 >@@ -82,6 +82,8 @@ > static gint style_id; > static GkrellmTicks *pGK; > >+DBusGProxy* proxy = NULL; >+ > /* drag and drop support */ > > enum { >@@ -103,25 +105,25 @@ > if (!xmms_running) return ; > > switch (i) { >- case gkrellmms_prev: xmms_remote_playlist_prev(xmms_session); break; >+ case gkrellmms_prev: audacious_remote_playlist_prev(proxy); break; > case gkrellmms_play: >- if (xmms_remote_is_playing(xmms_session) && >- !xmms_remote_is_paused(xmms_session)) >- xmms_remote_pause(xmms_session); >+ if (audacious_remote_is_playing(proxy) && >+ !audacious_remote_is_paused(proxy)) >+ audacious_remote_pause(proxy); > else >- xmms_remote_play(xmms_session); >+ audacious_remote_play(proxy); > break; >- case gkrellmms_paus: xmms_remote_pause(xmms_session); break; >+ case gkrellmms_paus: audacious_remote_pause(proxy); break; > case gkrellmms_stop: >- xmms_remote_stop(xmms_session); >+ audacious_remote_stop(proxy); > // FIXME time_krell->previous = t = 0; > break; >- case gkrellmms_next: xmms_remote_playlist_next(xmms_session); break; >+ case gkrellmms_next: audacious_remote_playlist_next(proxy); break; > case gkrellmms_eject: > if (eject_opens_playlist) > pl_show_playlist(); > else >- xmms_remote_eject(xmms_session); >+ audacious_remote_eject(proxy); > break; > } > } >@@ -211,13 +213,13 @@ > > playlist_changed = update_playlist(); > >- if ((xmms_running = xmms_remote_is_running(xmms_session))) { >+ if ((xmms_running = audacious_remote_is_running(proxy))) { > /* position is changed in the playlist when the playlist is changed too ! > */ > position_changed = > pl_get_current_position() != prev_position || playlist_changed; > prev_position = pl_get_current_position(); >- xmms_playing = xmms_remote_is_playing(xmms_session); >+ xmms_playing = audacious_remote_is_playing(proxy); > > if (scroll_panel) { > /* Scrollbar */ >@@ -228,7 +230,7 @@ > scrolling_title_text = get_scrolling_title_text(&len, FALSE); > time = pl_get_current_time(); > if (scrolling_tooltip != NULL) { >- xmms_remote_get_info(xmms_session, &rate, &freq, &nch); >+ audacious_remote_get_info(proxy, &rate, &freq, &nch); > prev_scrolling_tooltip_text = scrolling_tooltip_text; > scrolling_tooltip_text = g_strdup_printf("%s\n%d%s - %dHz - %s", > scrolling_title_text, rate / 1000, >@@ -297,7 +299,7 @@ > if (slider_in_motion == NULL) { > xmms_decal->x_off = 1; > if(xmms_running && (xmms_playing || position_changed) && draw_time){ >- output_time = xmms_remote_get_output_time(xmms_session); >+ output_time = audacious_remote_get_output_time(proxy); > /* calculate slider position */ > slider_position = pl_get_current_time() ? > ((output_time * 100) / pl_get_current_time()) : 0; >@@ -334,7 +336,7 @@ > if (!xmms_running) { > on_index = led_playing_index; > off_index = led_off_index; >- } else if (xmms_remote_is_paused(xmms_session)) { >+ } else if (audacious_remote_is_paused(proxy)) { > on_index = led_off_index; /* invert the duty cycle */ > off_index = led_paused_index; > } else if (!xmms_playing) { >@@ -397,9 +399,9 @@ > drag_data_received(GtkWidget *window,GdkDragContext *context, gint x, gint y, > GtkSelectionData *data,guint info,guint time,gpointer date) { > if (data->data) { >- xmms_remote_playlist_clear(xmms_session); >- xmms_remote_playlist_add_url_string(xmms_session,(gchar *)data->data); >- xmms_remote_play(xmms_session); >+ audacious_remote_playlist_clear(proxy); >+ audacious_remote_playlist_add_url_string(proxy,(gchar *)data->data); >+ audacious_remote_play(proxy); > update_playlist(); > } > } >@@ -437,29 +439,29 @@ > | P200 I really notice some bugs without it. > */ > if (!xmms_playing) >- xmms_remote_play(xmms_session); >+ audacious_remote_play(proxy); > timer = time(<); > > /* Do nothing, wait until xmms really plays; > | stop waiting after 10 seconds. > */ > /* FIXME ugly evil code */ >- while (!xmms_remote_is_playing(xmms_session) && ((time(<) - timer) < 10)) >+ while (!audacious_remote_is_playing(proxy) && ((time(<) - timer) < 10)) > { > usleep(0); > } > >- xmms_remote_jump_to_time(xmms_session, where_to_jump); >+ audacious_remote_jump_to_time(proxy, where_to_jump); > > timer = localtime(<)->tm_sec; > > /* Wait till really jumped before we continue. */ >- while ((xmms_remote_get_output_time(xmms_session) / 1000) >+ while ((audacious_remote_get_output_time(proxy) / 1000) > != (where_to_jump / 1000) && ((time(<) - timer) < 10)) > usleep(0); > } > else if((slider_in_motion != NULL) && !xmms_playing) >- xmms_remote_play(xmms_session); >+ audacious_remote_play(proxy); > > slider_in_motion = NULL; > got_motion = FALSE; >@@ -482,15 +484,15 @@ > xmms_start_func(); > break; > case 2: >- if (xmms_running && xmms_remote_is_playing(xmms_session)) >+ if (xmms_running && audacious_remote_is_playing(proxy)) > { > if (krell_mmb_pause) >- xmms_remote_pause(xmms_session); >+ audacious_remote_pause(proxy); > else >- xmms_remote_stop(xmms_session); >+ audacious_remote_stop(proxy); > } > else if (xmms_running) >- xmms_remote_play(xmms_session); >+ audacious_remote_play(proxy); > else > xmms_start_func(); > break; >@@ -811,16 +813,15 @@ > static GkrellmPiximage *bg_scroll_image; > > if (first_create) { >- xmms_running = xmms_remote_is_running(xmms_session); >+ xmms_running = audacious_remote_is_running(proxy); > if (auto_main_close && xmms_running) >- xmms_remote_main_win_toggle(xmms_session, FALSE); >+ audacious_remote_main_win_toggle(proxy, FALSE); > if (xmms_autostart && !xmms_running) xmms_start_func(); >- >- pl_init(); >+ pl_init(); > control_panel = gkrellm_panel_new0(); > } else { >- update_playlist(); >- } >+ update_playlist(); >+ } > > style = gkrellm_meter_style(DEFAULT_STYLE); > if (scroll_style) g_free(scroll_style); >@@ -860,7 +861,7 @@ > > if (scrolling_tooltip == NULL) { > scrolling_tooltip = gtk_tooltips_new(); >- scrolling_tooltip_text = g_strdup("xmms"); >+ scrolling_tooltip_text = g_strdup("audacious"); > gtk_tooltips_set_tip(scrolling_tooltip, scroll_panel->drawing_area, > scrolling_tooltip_text, NULL); > gtk_tooltips_set_delay(scrolling_tooltip, 750); >@@ -874,7 +875,7 @@ > gkrellm_set_krell_full_scale(time_krell, 100, 1); > > m = gkrellm_get_style_margins(style); >- w = gkrellm_gdk_string_width(ts->font, "-000:00"); >+ w = gkrellm_gdk_string_width(ts->font, "-000:00xxx"); > xmms_decal = gkrellm_create_decal_text(control_panel, (gchar *) "A0", ts, > style, -1, -1, w); > xmms_decal->x += m->left; >@@ -973,7 +974,7 @@ > void mainwin_back_func() > { > if (auto_main_close && xmms_running) >- xmms_remote_main_win_toggle(xmms_session, TRUE); >+ audacious_remote_main_win_toggle(proxy, TRUE); > } > > static GkrellmMonitor plugin_mon = >@@ -1007,6 +1008,8 @@ > GkrellmMonitor * > gkrellm_init_plugin(void) { > gchar *tmp; >+ GError *error = NULL; >+ static DBusGConnection *connection = NULL; > > #ifdef ENABLE_NLS > bind_textdomain_codeset(PACKAGE, "UTF-8"); >@@ -1016,6 +1019,14 @@ > running_factory = options_menu_factory(1); > not_running_factory = options_menu_factory(0); > >+ >+ >+ connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error); >+ >+ proxy = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE, >+ AUDACIOUS_DBUS_PATH, >+ AUDACIOUS_DBUS_INTERFACE); >+ > /* Default settings */ > control_panel = NULL; > xmms_running = FALSE; >@@ -1033,16 +1044,11 @@ > > playlist_dir = g_strdup(gkrellm_homedir()); > files_directory = g_strdup("/"); >- gkrellmms_label = g_strdup("xmms"); >- xmms_session = 0; >+ gkrellmms_label = g_strdup("audacious"); > scroll_enable = TRUE; > scroll_separator = g_strdup(SCROLL_SEPARATOR); > draw_time = 1; >-#ifdef USE_BMP >- xmms_exec_command = g_strdup("beep-media-player"); >-#else >- xmms_exec_command = g_strdup("xmms"); >-#endif >+ xmms_exec_command = g_strdup("audacious"); > xmms_autostart = 0; > auto_main_close = 0; > auto_hide_all = 0; >diff -Naur ../gkrellmms/gkrellmms.h ./gkrellmms.h >--- ../gkrellmms/gkrellmms.h 2005-01-21 18:02:17.000000000 +0100 >+++ ./gkrellmms.h 2008-02-01 14:45:48.000000000 +0100 >@@ -25,11 +25,9 @@ > #include <time.h> > #include <gkrellm2/gkrellm.h> > >-#ifdef USE_BMP >-#include <bmp/beepctrl.h> >-#else >-#include <xmms/xmmsctrl.h> >-#endif >+#include <audacious/audctrl.h> >+#include <audacious/dbus.h> >+ > > #include "playlist.h" > /* You can change these ones, but at your own risk. >@@ -105,6 +103,8 @@ > > > /* Very global vars */ >+extern DBusGProxy* proxy; >+ > GtkItemFactory *running_factory; > GtkItemFactory *not_running_factory; > >@@ -120,7 +120,6 @@ > gchar *scroll_separator; > gint scroll_enable; > gint enable_buttonbar; >-gint xmms_session; > gint xmms_autostart; > gint auto_main_close; > gint auto_hide_all; >diff -Naur ../gkrellmms/Makefile ./Makefile >--- ../gkrellmms/Makefile 2005-01-21 18:02:17.000000000 +0100 >+++ ./Makefile 2008-02-01 14:44:27.000000000 +0100 >@@ -8,24 +8,18 @@ > IMLIB_INCLUDE ?= > IMLIB_LIB ?= > >-ifdef USE_BMP >- XMMS_INCLUDE ?= `pkg-config bmp --cflags` >- XMMS_LIB ?= `pkg-config bmp --libs` >-else >- XMMS_INCLUDE ?= `xmms-config --cflags` >- XMMS_LIB ?= `xmms-config --libs` >-endif >+XMMS_INCLUDE ?= `pkg-config audacious --cflags` >+XMMS_LIB ?= `pkg-config audacious --libs` >+ >+DBUS_INCLUDE ?= `pkg-config dbus-1 --cflags` >+DBUS_LIB ?= `pkg-config dbus-1 --libs` > > PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins > >-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE) >-LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB) >+FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(DBUS_INCLUDE) $(XMMS_INCLUDE) >+LIBS = $(GTK_LIB) $(IMLIB_LIB) $(DBUS_LIB) $(XMMS_LIB) > LFLAGS = -shared -lpthread > >-ifdef USE_BMP >- FLAGS += -DUSE_BMP >-endif >- > LOCALEDIR ?= /usr/share/locale > ifeq ($(enable_nls),1) > FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\" >diff -Naur ../gkrellmms/options.c ./options.c >--- ../gkrellmms/options.c 2005-01-21 18:02:17.000000000 +0100 >+++ ./options.c 2008-02-01 15:43:09.000000000 +0100 >@@ -26,7 +26,6 @@ > *playlist_dir_entry, > *label_entry, > *separator_entry, >- *session_entry, > *xmms_start_entry, > *scroll_enable_entry, > *main_close_entry, >@@ -52,28 +51,28 @@ > switch (type) > { > case gkrellmms_mainwin: >- xmms_remote_main_win_toggle(xmms_session, >- !xmms_remote_is_main_win(xmms_session)); >+ audacious_remote_main_win_toggle(proxy, >+ !audacious_remote_is_main_win(proxy)); > break; > case gkrellmms_playlist: >- xmms_remote_pl_win_toggle(xmms_session, >- !xmms_remote_is_pl_win(xmms_session)); >+ audacious_remote_pl_win_toggle(proxy, >+ !audacious_remote_is_pl_win(proxy)); > break; > case gkrellmms_eq: >- xmms_remote_eq_win_toggle(xmms_session, >- !xmms_remote_is_eq_win(xmms_session)); >+ audacious_remote_eq_win_toggle(proxy, >+ !audacious_remote_is_eq_win(proxy)); > break; > case gkrellmms_repeat: >- xmms_remote_toggle_repeat(xmms_session); >+ audacious_remote_toggle_repeat(proxy); > break; > case gkrellmms_shuffle: >- xmms_remote_toggle_shuffle(xmms_session); >+ audacious_remote_toggle_shuffle(proxy); > break; > case gkrellmms_eject: >- xmms_remote_eject(xmms_session); >+ audacious_remote_eject(proxy); > break; > case gkrellmms_prefs: >- xmms_remote_show_prefs_box(xmms_session); >+ audacious_remote_show_prefs_box(proxy); > break; > default: > do_xmms_command(type); >@@ -83,7 +82,7 @@ > > void aot_func(GtkWidget *w, gpointer data) > { >- xmms_remote_toggle_aot(xmms_session, GPOINTER_TO_INT(data)); >+ audacious_remote_toggle_aot(proxy, GPOINTER_TO_INT(data)); > } > > void save_time(gint); >@@ -118,15 +117,15 @@ > */ > /* FIXME supposed ugly evil code */ > timer = time(<); >- while (!xmms_remote_is_running(xmms_session) && ((time(<) - timer) < 10)) >+ while (!audacious_remote_is_running(proxy) && ((time(<) - timer) < 10)) > usleep(0); > >- xmms_running = xmms_remote_is_running(xmms_session); >+ xmms_running = audacious_remote_is_running(proxy); > > if (auto_hide_all && xmms_running) { >- xmms_remote_main_win_toggle(xmms_session, FALSE); >- xmms_remote_pl_win_toggle(xmms_session, FALSE); >- xmms_remote_eq_win_toggle(xmms_session, FALSE); >+ audacious_remote_main_win_toggle(proxy, FALSE); >+ audacious_remote_pl_win_toggle(proxy, FALSE); >+ audacious_remote_eq_win_toggle(proxy, FALSE); > } > } > >@@ -143,8 +142,8 @@ > time(<); > timer = lt; > >- xmms_remote_quit(xmms_session); >- while (xmms_remote_is_running(xmms_session) >+ audacious_remote_quit(proxy); >+ while (audacious_remote_is_running(proxy) > && ((time(<) - timer) < 10)) { > /* Do nothing; wait until xmms really quits, but not longer than 10sec! */ > usleep(0); >@@ -167,40 +166,36 @@ > > static GtkItemFactoryEntry gkrellmms_factory[] = > { >- {"/-", NULL, NULL, 0, "<Separator>"}, >- {N_("/Toggles..."), NULL, NULL, 0, "<Branch>"}, >- {N_("/Toggles.../Main Window"), NULL, toggles_func, gkrellmms_mainwin, "<Item>"}, >- {N_("/Toggles.../Playlist"), NULL, toggles_func, gkrellmms_playlist, "<Item>"}, >- {N_("/Toggles.../EQ"), NULL, toggles_func, gkrellmms_eq, "<Item>"}, >- {N_("/Toggles.../Repeat"), NULL, toggles_func, gkrellmms_repeat, "<Item>"}, >- {N_("/Toggles.../Shuffle"), NULL, toggles_func, gkrellmms_shuffle, "<Item>"}, >- {N_("/Toggles.../-"), NULL, NULL, 0, "<Separator>"}, >- {N_("/Toggles.../Always on top on"), NULL, aot_func, ON, "<Item>"}, >- {N_("/Toggles.../Always on top off"), NULL, aot_func, OFF, "<Item>"}, >+ {N_("/Toggles"), NULL, NULL, 0, "<Branch>"}, >+ {N_("/Toggles/Main Window"), NULL, toggles_func, gkrellmms_mainwin, "<Item>"}, >+ {N_("/Toggles/Playlist"), NULL, toggles_func, gkrellmms_playlist, "<Item>"}, >+ {N_("/Toggles/EQ"), NULL, toggles_func, gkrellmms_eq, "<Item>"}, >+ {N_("/Toggles/Repeat"), NULL, toggles_func, gkrellmms_repeat, "<Item>"}, >+ {N_("/Toggles/Shuffle"), NULL, toggles_func, gkrellmms_shuffle, "<Item>"}, >+ {N_("/Toggles/-"), NULL, NULL, 0, "<Separator>"}, >+ {N_("/Toggles/Always on top on"), NULL, aot_func, ON, "<Item>"}, >+ {N_("/Toggles/Always on top off"), NULL, aot_func, OFF, "<Item>"}, > {"/-", NULL, NULL, 0, "<Separator>"}, >- {"/Xmms...", NULL, NULL, 0, "<Branch>"}, >- {N_("/Xmms.../Previous"), NULL, toggles_func, gkrellmms_prev, "<Item>"}, >- {N_("/Xmms.../Play"), NULL, toggles_func, gkrellmms_play, "<Item>"}, >- {N_("/Xmms.../Pause"), NULL, toggles_func, gkrellmms_paus, "<Item>"}, >- {N_("/Xmms.../Stop"), NULL, toggles_func, gkrellmms_stop, "<Item>"}, >- {N_("/Xmms.../Next"), NULL, toggles_func, gkrellmms_next, "<Item>"}, >+ {"/Audacious", NULL, NULL, 0, "<Branch>"}, >+ {N_("/Audacious/Previous"), NULL, toggles_func, gkrellmms_prev, "<Item>"}, >+ {N_("/Audacious/Play"), NULL, toggles_func, gkrellmms_play, "<Item>"}, >+ {N_("/Audacious/Pause"), NULL, toggles_func, gkrellmms_paus, "<Item>"}, >+ {N_("/Audacious/Stop"), NULL, toggles_func, gkrellmms_stop, "<Item>"}, >+ {N_("/Audacious/Next"), NULL, toggles_func, gkrellmms_next, "<Item>"}, > {"/-", NULL, NULL, 0, "<Separator>"}, > {N_("/Playlist Editor"), NULL, open_playlist_cb, 0, "<Item>"}, > {N_("/GKrellMMS Options"), NULL, open_options_cb, 0, "<Item>"}, > {"/-", NULL, NULL, 0, "<Separator>"}, > {N_("/Open file(s)"), NULL, toggles_func, gkrellmms_eject, "<Item>"}, > {N_("/Open Playlist"), NULL, load_playlist_cb, 0, "<Item>"}, >- {N_("/XMMS Prefs"), NULL, toggles_func, gkrellmms_prefs, "<Item>"}, >- {"/-", NULL, NULL, 0, "<Separator>"}, >- {N_("/Quit XMMS"), NULL, quit_func, 0, "<Item>"}, >+ {N_("/Audacious Preferences"), NULL, toggles_func, gkrellmms_prefs, "<Item>"}, > {"/-", NULL, NULL, 0, "<Separator>"}, >+ {N_("/Quit Audacious"), NULL, quit_func, 0, "<Item>"}, > }; > > static GtkItemFactoryEntry gkrellmms_factory_norun[] = > { >- {"/-", NULL, NULL, 0, "<Separator>"}, >- {N_("/Launch XMMS"), NULL, start_func, 0, "<Item>"}, >- {"/-", NULL, NULL, 0, "<Separator>"}, >+ {N_("/Launch Audacious"), NULL, start_func, 0, "<Item>"}, > }; > > GtkItemFactory *options_menu_factory(gint run_menu) >@@ -261,9 +256,6 @@ > scroll_separator = g_strdup(gtk_entry_get_text(GTK_ENTRY(separator_entry))); > gkrellmms_set_scroll_separator_len(); > >- xmms_session = gtk_spin_button_get_value_as_int( >- GTK_SPIN_BUTTON(session_entry)); >- > /* Toggles */ > prev_scroll_enable = scroll_enable; > scroll_enable = GTK_TOGGLE_BUTTON(scroll_enable_entry)->active; >@@ -284,7 +276,6 @@ > void save_gkrellmms_config(FILE *f) > { > fprintf(f, "%s scroll_enable %d\n", CONFIG_KEYWORD, scroll_enable); >- fprintf(f, "%s xmms_session %d\n", CONFIG_KEYWORD, xmms_session); > fprintf(f, "%s draw_time %d\n", CONFIG_KEYWORD, draw_time); > fprintf(f, "%s xmms_autostart %d\n", CONFIG_KEYWORD, xmms_autostart); > fprintf(f, "%s auto_main_close %d\n", CONFIG_KEYWORD, auto_main_close); >@@ -311,8 +302,6 @@ > { > if (strcmp(config, "scroll_enable") == 0) > sscanf(item, "%d\n", &scroll_enable); >- else if (strcmp(config, "xmms_session") == 0) >- sscanf(item, "%d\n", &xmms_session); > else if (strcmp(config, "xmms_autostart") == 0) > sscanf(item, "%d\n", &xmms_autostart); > else if (strcmp(config, "auto_main_close") == 0) >@@ -413,7 +402,6 @@ > *time_draw_entry, > *pause_entry, > *time_fmt_entry; >- GtkAdjustment *adjust; > GSList *eject_group = NULL, > *time_draw_group = NULL, > *pause_group = NULL, >@@ -423,19 +411,19 @@ > gint i; > static gchar *gkrellmms_help_text[] = > { >- N_("GKrellMMS is a GKrellM XMMS-plugin which allows you to control \n" \ >- "XMMS from within GKrellM. It features some cool things, such as: \n" \ >+ N_("GKrellMMS is a GKrellM Audacious-plugin which allows you to control \n" \ >+ "Audacious from within GKrellM. It features some cool things, such as: \n" \ > "\n" \ > "- A scrolling title. \n" \ > "- A Krell which indicates where you are in a song. \n" \ >- "- Themeable buttons for controlling XMMS. \n" \ >+ "- Themeable buttons for controlling Audacious. \n" \ > "- A playlist editor. \n" \ >- "- A gtk-popup-menu with misc. XMMS-functions. \n" \ >+ "- A gtk-popup-menu with misc. Audacious-functions. \n" \ > "\n"), > > N_("<b>How to use GKrellMMS: \n"), > N_("\n" \ >- "You can do some cool stuff with the XMMS-Krell, by using your mouse. \n" \ >+ "You can do some cool stuff with the Audacious-Krell, by using your mouse. \n" \ > "\n"), > > N_("<b>Mouse actions: \n" \ >@@ -443,8 +431,8 @@ > N_("Jump through song. \n"), > > N_("<b>\tMiddle mouse-button: "), >- N_("Pause/stop/play XMMS (configurable), \n" \ >- "\t or launch XMMS if it's not running. \n"), >+ N_("Pause/stop/play Audacious (configurable), \n" \ >+ "\t or launch Audacious if it's not running. \n"), > > N_("<b>\tRight mouse-button: "), > N_("Popup-menu. \n" \ >@@ -453,16 +441,16 @@ > "\n"), > > N_("<b>\tConstant red: "), >- N_("XMMS is turned off. \n"), >+ N_("Audacious is turned off. \n"), > > N_("<b>\tConstant green: "), >- N_("XMMS is playing. \n"), >+ N_("Audacious is playing. \n"), > > N_("<b>\tRed, blinking green: "), >- N_("XMMS is stopped. \n"), >+ N_("Audacious is stopped. \n"), > > N_("<b>\tGreen, blinking red: "), >- N_("XMMS is paused. \n" \ >+ N_("Audacious is paused. \n" \ > "\n"), > > N_("<b>Configurabilities:\n"), >@@ -473,15 +461,15 @@ > > N_("<b>Configs tab: \n" \ > "\n" \ >- "\tXMMS Executable: \n"), >+ "\tAudacious Executable: \n"), > >- N_("\tHow the XMMS-executable (+ eventually path) \n" \ >- "\tis called on your computer. Default is xmms\n" \ >+ N_("\tHow the Audacious-executable (+ eventually path) \n" \ >+ "\tis called on your computer. Default is audacious\n" \ > "\n"), > > N_("<b>\tFiles Directory: \n"), > N_("\tThe directory where your mp3's/xm's/whatever \n" \ >- "\tare stored in. When starting XMMS from GKrellM, it will go to this \n" \ >+ "\tare stored in. When starting Audacious from GKrellM, it will go to this \n" \ > "\tdirectory when ejecting. \n" \ > "\n"), > >@@ -490,7 +478,7 @@ > "\n"), > > N_("<b>\tKrell label: \n"), >- N_("\tThe text-label you want in the krell when xmms isn't running/playing. \n" \ >+ N_("\tThe text-label you want in the krell when Audacious isn't running/playing. \n" \ > "\n"), > > N_("<b>\tScroll separator: \n"), >@@ -498,11 +486,6 @@ > "\tIt defaults to ' *** ' (that's 3 spaces, 3 *'s and 3 spaces). \n" \ > "\n"), > >- N_("<b>\tXMMS Session to use: \n"), >- N_("\tThe XMMS-session you want to use with GKrellMMS. \n" \ >- "\tUse 0 if you only have 1 XMMS running. \n" \ >- "\n"), >- > N_("<b>Toggles tab: \n" \ > "\n" \ > "\tDraw minus (-) with remaining time: \n"), >@@ -510,23 +493,23 @@ > N_("\tDraw a minus (-) before the remaining time, when you have \n" \ > "\tthe output-time displaying remaining time. \n\n"), > >- N_("<b>\tXMMS Auto Launch: \n"), >- N_("\tAuto launch XMMS when starting GKrellMMS. \n" \ >+ N_("<b>\tAudacious Auto Launch: \n"), >+ N_("\tAuto launch Audacious when starting GKrellMMS. \n" \ > "\n"), > > N_("<b>\tAuto Mainwindow Close: \n"), >- N_("\tAutomatically close the XMMS-mainwindow \n" \ >- "\twhen GKrellMMS starts, and XMMS is already running, or when \n" \ >- "\tlaunching XMMS while GKrellMMS runs. This option also enables the \n" \ >+ N_("\tAutomatically close the Audacious-mainwindow \n" \ >+ "\twhen GKrellMMS starts, and Audacious is already running, or when \n" \ >+ "\tlaunching Audacious while GKrellMMS runs. This option also enables the \n" \ > "\tmainwindow back when you quit gkrellm (some people really do). \n" \ > "\n"), > >- N_("<b>\tAuto hide all XMMS windows: \n"), >- N_("\tAutomatically hide all XMMS windows when GKrellMMS starts. \n" \ >+ N_("<b>\tAuto hide all Audacious windows: \n"), >+ N_("\tAutomatically hide all Audacious windows when GKrellMMS starts. \n" \ > "\n"), > > N_("<b>\tAuto start playing: \n"), >- N_("\tAutomatically start playing when launching XMMS. \n\n"), >+ N_("\tAutomatically start playing when launching Audacious. \n\n"), > > N_("<b>\tEnable scrolling title: \n"), > N_("\tEnable/disable the scrolling title-panel. \n" \ >@@ -537,13 +520,13 @@ > "\tEject opens: \n"), > > N_("\tCheck whether the eject-button on the button-bar opens a \n" \ >- "\tplaylist or an other XMMS-file. \n" \ >+ "\tplaylist or an other Audacious-file. \n" \ > "\n"), > > N_("<b>\tMMB on krell click: \n"), > N_("\tCheck whether GKrellMMS should pause/continue or \n" \ > "\tstop/play the current song on a MMB-click on the krell. MMB Click will \n" \ >- "\talways start playing the song if XMMS isn't playing. \n" \ >+ "\talways start playing the song if Audacious isn't playing. \n" \ > "\n"), > > N_("<b>\tLoad file-info: \n"), >@@ -553,7 +536,7 @@ > "\tplaylist editor, or are playing on a slow network/cdrom. \n\n"), > > N_("<b>\tDraw in time bar: \n"), >- N_("\tCheck whether to draw the output time or 'xmms' in \n" \ >+ N_("\tCheck whether to draw the output time or 'audacious' in \n" \ > "\tthe time-krell panel. \n" \ > "\n"), > >@@ -577,7 +560,7 @@ > hbox = gtk_hbox_new(FALSE, 5); > > zbox = gtk_vbox_new(FALSE, 0); >- label = gtk_label_new(_("XMMS Executable:")); >+ label = gtk_label_new(_("Audacious Executable:")); > gtk_box_pack_start(GTK_BOX(zbox), label, TRUE, FALSE, 0); > label = gtk_label_new(_("Files Directory:")); > gtk_box_pack_start(GTK_BOX(zbox), label, TRUE, FALSE, 0); >@@ -618,17 +601,6 @@ > gtk_box_pack_start(GTK_BOX(hbox), zbox, FALSE, FALSE, 0); > gtk_container_add(GTK_CONTAINER(vbox), hbox); > >- hbox = gtk_hbox_new(FALSE, 5); >- adjust = (GtkAdjustment *) gtk_adjustment_new((gfloat) xmms_session, 0.0, >- 100.0, 1.0, 5.0, 0.0); >- session_entry = gtk_spin_button_new(adjust, 1.0, 1); >- gtk_spin_button_set_digits(GTK_SPIN_BUTTON(session_entry), (guint) 0); >- gtk_spin_button_set_value(GTK_SPIN_BUTTON(session_entry), xmms_session); >- gtk_box_pack_start(GTK_BOX(hbox), session_entry, FALSE, FALSE, 0); >- label = gtk_label_new(_("XMMS Session to use")); >- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); >- gtk_container_add(GTK_CONTAINER(vbox), hbox); >- > label = gtk_label_new(_("Configs")); > gtk_container_add(GTK_CONTAINER(frame), vbox); > gtk_notebook_append_page(GTK_NOTEBOOK(laptop), frame, label); >@@ -644,19 +616,19 @@ > gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(draw_minus_entry), draw_minus); > gtk_container_add(GTK_CONTAINER(vbox), draw_minus_entry); > >- xmms_start_entry = gtk_check_button_new_with_label(_("Auto launch XMMS on GKrellMMS startup")); >+ xmms_start_entry = gtk_check_button_new_with_label(_("Auto launch Audacious on GKrellMMS startup")); > gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(xmms_start_entry), xmms_autostart); > gtk_container_add(GTK_CONTAINER(vbox), xmms_start_entry); > >- main_close_entry = gtk_check_button_new_with_label(_("Auto close (and open) XMMS Mainwin")); >+ main_close_entry = gtk_check_button_new_with_label(_("Auto close (and open) Audacious Mainwin")); > gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(main_close_entry), auto_main_close); > gtk_container_add(GTK_CONTAINER(vbox), main_close_entry); > >- hide_all_entry = gtk_check_button_new_with_label(_("Auto hide all XMMS windows on XMMS startup")); >+ hide_all_entry = gtk_check_button_new_with_label(_("Auto hide all Audacious windows on Audacious startup")); > gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hide_all_entry), auto_hide_all); > gtk_container_add(GTK_CONTAINER(vbox), hide_all_entry); > >- auto_play_entry = gtk_check_button_new_with_label(_("Auto start playing on XMMS launch")); >+ auto_play_entry = gtk_check_button_new_with_label(_("Auto start playing on Audaciou launch")); > gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_play_entry), auto_play_start); > gtk_container_add(GTK_CONTAINER(vbox), auto_play_entry); > >@@ -720,7 +692,7 @@ > gtk_signal_connect(GTK_OBJECT(time_draw_entry), "pressed", > (GtkSignalFunc) time_type_set, GINT_TO_POINTER(1)); > >- time_draw_entry = gtk_radio_button_new_with_label(time_draw_group, _("XMMS-text")); >+ time_draw_entry = gtk_radio_button_new_with_label(time_draw_group, _("Audacious-text")); > gtk_box_pack_start(GTK_BOX(zbox), time_draw_entry, FALSE, FALSE, 0); > gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(time_draw_entry), !draw_time); > gtk_signal_connect(GTK_OBJECT(time_draw_entry), "pressed", >@@ -840,8 +812,9 @@ > /* About */ > gkrellmms_info_text = g_strdup_printf( > _("GKrellMMS %d.%d.%d\n" \ >- "GKrellM XMMS Plugin\n" \ >+ "GKrellM Audacious Plugin\n" \ > "\n" \ >+ "Copyright (C) 2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"\ > "Copyright (C) 2000-2002 Sander Klein Lebbink <sander@cerberus.demon.nl>\n"\ > "Current Maintainer: Sjoerd Simons <sjoerd@luon.net>\n" \ > "http://gkrellm.luon.net/\n" \ >diff -Naur ../gkrellmms/playlist.c ./playlist.c >--- ../gkrellmms/playlist.c 2005-01-21 18:02:17.000000000 +0100 >+++ ./playlist.c 2008-02-01 15:32:56.000000000 +0100 >@@ -107,16 +107,16 @@ > void update_playlist_position(void) { > GtkTreeIter iter; > >- current_position = xmms_remote_get_playlist_pos(xmms_session) + 1; >+ current_position = audacious_remote_get_playlist_pos(proxy) + 1; > g_free(current_title); > g_free(current_file); > if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(playlist), > &iter, NULL, current_position -1)) { >- current_file = xmms_remote_get_playlist_file(xmms_session, >+ current_file = audacious_remote_get_playlist_file(proxy, > current_position -1); >- current_title = xmms_remote_get_playlist_title(xmms_session, >+ current_title = audacious_remote_get_playlist_title(proxy, > current_position -1); >- current_time = xmms_remote_get_playlist_time(xmms_session, >+ current_time = audacious_remote_get_playlist_time(proxy, > current_position -1); > > current_file = string_to_utf8(current_file, TRUE); >@@ -154,13 +154,13 @@ > > total_plist_time = 0; > >- if (!xmms_remote_is_running(xmms_session)) return; >+ if (!audacious_remote_is_running(proxy)) return; > >- len = xmms_remote_get_playlist_length(xmms_session); >+ len = audacious_remote_get_playlist_length(proxy); > playlist_length = len; > > for (i = 0 ; i < len ; i ++) { >- filename = xmms_remote_get_playlist_file(xmms_session, i); >+ filename = audacious_remote_get_playlist_file(proxy, i); > if (filename == NULL) { > /* error occurred empty playlist and try again */ > empty_playlist(); >@@ -173,11 +173,11 @@ > > gtk_list_store_append(playlist,&iter); > if (always_load_info) { >- title = xmms_remote_get_playlist_title(xmms_session, i); >+ title = audacious_remote_get_playlist_title(proxy, i); > if (title != NULL) { > title = string_to_utf8(title, FALSE); > } >- time = xmms_remote_get_playlist_time(xmms_session, i); >+ time = audacious_remote_get_playlist_time(proxy, i); > gtk_list_store_set(playlist,&iter, > PLAYLIST_POSITION,i+ 1, > PLAYLIST_TITLE,title == NULL ? "" : title, >@@ -206,13 +206,14 @@ > char *filename = NULL; > > /* playlist lenght changed, reload */ >- if (playlist_length != xmms_remote_get_playlist_length(xmms_session)) { >+ if (playlist_length != audacious_remote_get_playlist_length(proxy)) { > empty_playlist(); >+ playlist_length = -1; > load_playlist(); > return TRUE; > } > filename = string_to_utf8( >- xmms_remote_get_playlist_file(xmms_session,current_position-1), >+ audacious_remote_get_playlist_file(proxy,current_position-1), > TRUE > ); > >@@ -224,7 +225,7 @@ > } > g_free(filename); > >- if (xmms_remote_get_playlist_pos(xmms_session) != current_position + 1) { >+ if (audacious_remote_get_playlist_pos(proxy) != current_position + 1) { > update_playlist_position(); > } > return TRUE; >@@ -273,9 +274,9 @@ > } > list = g_list_append(list,path); > } >- if (xmms_remote_is_running(xmms_session)) { >- xmms_remote_playlist_clear(xmms_session); >- xmms_remote_playlist_add(xmms_session, list); >+ if (audacious_remote_is_running(proxy)) { >+ audacious_remote_playlist_clear(proxy); >+ audacious_remote_playlist_add(proxy, list); > } > > for (tlist = list; tlist != NULL; tlist = g_list_next(tlist)) { >@@ -386,8 +387,8 @@ > gtk_tree_model_get(GTK_TREE_MODEL(playlist),&iter, > PLAYLIST_POSITION,&position, > -1); >- xmms_remote_set_playlist_pos(xmms_session,position - 1); >- xmms_remote_play(xmms_session); >+ audacious_remote_set_playlist_pos(proxy,position - 1); >+ audacious_remote_play(proxy); > return TRUE; > } > >diff -Naur ../gkrellmms/playlist.h ./playlist.h >--- ../gkrellmms/playlist.h 2005-01-21 18:02:17.000000000 +0100 >+++ ./playlist.h 2008-02-01 14:07:37.000000000 +0100 >@@ -24,11 +24,7 @@ > #include <stdio.h> > #include <time.h> > >-#ifdef USE_BMP >-#include <bmp/beepctrl.h> >-#else >-#include <xmms/xmmsctrl.h> >-#endif >+#include <audacious/auddrct.h> > > #include "gkrellmms.h" >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=142404">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 199620
:
136340
|
136341
| 142404
