# HG changeset patch # User nenolod # Date 1178912945 25200 # Node ID b189991f74174e75ff58687a6fa77357e35cd493 # Parent 8249a1248a098711e3c96b5b03afc2da493ecc1e [svn] - split handlers out to handlers.c diff -r 8249a1248a09 -r b189991f7417 ChangeLog --- a/ChangeLog Fri May 11 12:39:47 2007 -0700 +++ b/ChangeLog Fri May 11 12:49:05 2007 -0700 @@ -1,3 +1,13 @@ +2007-05-11 19:39:47 +0000 William Pitcock + revision [4498] + - avoid null dereferences + - handle command line options before plugin system is loaded + + trunk/src/audacious/main.c | 5 +---- + trunk/src/audacious/playlist.c | 5 ++++- + 2 files changed, 5 insertions(+), 5 deletions(-) + + 2007-05-11 19:35:52 +0000 William Pitcock revision [4496] - finish some stubs to make audtool work for my scripts diff -r 8249a1248a09 -r b189991f7417 src/audacious/build_stamp.c --- a/src/audacious/build_stamp.c Fri May 11 12:39:47 2007 -0700 +++ b/src/audacious/build_stamp.c Fri May 11 12:49:05 2007 -0700 @@ -1,2 +1,2 @@ #include -const gchar *svn_stamp = "20070511-4496"; +const gchar *svn_stamp = "20070511-4498"; diff -r 8249a1248a09 -r b189991f7417 src/audtool/Makefile --- a/src/audtool/Makefile Fri May 11 12:39:47 2007 -0700 +++ b/src/audtool/Makefile Fri May 11 12:49:05 2007 -0700 @@ -22,7 +22,7 @@ -I.. -I../.. \ -I../intl -SOURCES = audtool.c +SOURCES = audtool.c handlers.c OBJECTS = ${SOURCES:.c=.o} diff -r 8249a1248a09 -r b189991f7417 src/audtool/audtool.c --- a/src/audtool/audtool.c Fri May 11 12:39:47 2007 -0700 +++ b/src/audtool/audtool.c Fri May 11 12:49:05 2007 -0700 @@ -109,8 +109,8 @@ {NULL, NULL, NULL} }; -static mowgli_error_context_t *e = NULL; -static DBusGProxy *dbus_proxy = NULL; +mowgli_error_context_t *e = NULL; +DBusGProxy *dbus_proxy = NULL; static DBusGConnection *connection = NULL; static void audtool_connect(void) @@ -163,900 +163,3 @@ return 0; } - -/*** MOVE TO HANDLERS.C ***/ - -void get_current_song(gint argc, gchar **argv) -{ - gint playpos = audacious_remote_get_playlist_pos(dbus_proxy); - gchar *song = audacious_remote_get_playlist_title(dbus_proxy, playpos); - - if (!song) - { - g_print("No song playing.\n"); - return; - } - - g_print("%s\n", song); -} - -void get_current_song_filename(gint argc, gchar **argv) -{ - gint playpos = audacious_remote_get_playlist_pos(dbus_proxy); - - g_print("%s\n", audacious_remote_get_playlist_file(dbus_proxy, playpos)); -} - -void get_current_song_output_length(gint argc, gchar **argv) -{ - gint frames = audacious_remote_get_output_time(dbus_proxy); - gint length = frames / 1000; - - g_print("%d:%.2d\n", length / 60, length % 60); -} - -void get_current_song_output_length_seconds(gint argc, gchar **argv) -{ - gint frames = audacious_remote_get_output_time(dbus_proxy); - gint length = frames / 1000; - - g_print("%d\n", length); -} - -void get_current_song_output_length_frames(gint argc, gchar **argv) -{ - gint frames = audacious_remote_get_output_time(dbus_proxy); - - g_print("%d\n", frames); -} - -void get_current_song_length(gint argc, gchar **argv) -{ - gint playpos = audacious_remote_get_playlist_pos(dbus_proxy); - gint frames = audacious_remote_get_playlist_time(dbus_proxy, playpos); - gint length = frames / 1000; - - g_print("%d:%.2d\n", length / 60, length % 60); -} - -void get_current_song_length_seconds(gint argc, gchar **argv) -{ - gint playpos = audacious_remote_get_playlist_pos(dbus_proxy); - gint frames = audacious_remote_get_playlist_time(dbus_proxy, playpos); - gint length = frames / 1000; - - g_print("%d\n", length); -} - -void get_current_song_length_frames(gint argc, gchar **argv) -{ - gint playpos = audacious_remote_get_playlist_pos(dbus_proxy); - gint frames = audacious_remote_get_playlist_time(dbus_proxy, playpos); - - g_print("%d\n", frames); -} - -void get_current_song_bitrate(gint argc, gchar **argv) -{ - gint rate, freq, nch; - - audacious_remote_get_info(dbus_proxy, &rate, &freq, &nch); - - g_print("%d\n", rate); -} - -void get_current_song_bitrate_kbps(gint argc, gchar **argv) -{ - gint rate, freq, nch; - - audacious_remote_get_info(dbus_proxy, &rate, &freq, &nch); - - g_print("%d\n", rate / 1000); -} - -void get_current_song_frequency(gint argc, gchar **argv) -{ - gint rate, freq, nch; - - audacious_remote_get_info(dbus_proxy, &rate, &freq, &nch); - - g_print("%d\n", freq); -} - -void get_current_song_frequency_khz(gint argc, gchar **argv) -{ - gint rate, freq, nch; - - audacious_remote_get_info(dbus_proxy, &rate, &freq, &nch); - - g_print("%0.1f\n", (gfloat) freq / 1000); -} - -void get_current_song_channels(gint argc, gchar **argv) -{ - gint rate, freq, nch; - - audacious_remote_get_info(dbus_proxy, &rate, &freq, &nch); - - g_print("%d\n", nch); -} - -void get_current_song_tuple_field_data(gint argc, gchar **argv) -{ - gpointer data; - - if (argc < 3) - { - g_print("%s: invalid parameters for current-song-tuple-data.\n", argv[0]); - g_print("%s: syntax: %s current-song-tuple-data \n", argv[0], argv[0]); - g_print("%s: - fieldname example choices: performer, album_name,\n", argv[0]); - g_print("%s: track_name, track_number, year, date, genre, comment,\n", argv[0]); - g_print("%s: file_name, file_ext, file_path, length, formatter,\n", argv[0]); - g_print("%s: custom, mtime\n", argv[0]); - return; - } - - if (!(data = audacious_get_tuple_field_data(dbus_proxy, argv[2], audacious_remote_get_playlist_pos(dbus_proxy)))) - { - return; - } - - if (!strcasecmp(argv[2], "track_number") || !strcasecmp(argv[2], "year") || !strcasecmp(argv[2], "length") || !strcasecmp(argv[2], "mtime")) - { - if (*(gint *)data > 0) - { - g_print("%d\n", *(gint *)data); - } - return; - } - - g_print("%s\n", (gchar *)data); -} - -void playlist_reverse(gint argc, gchar **argv) -{ - audacious_remote_playlist_prev(dbus_proxy); -} - -void playlist_advance(gint argc, gchar **argv) -{ - audacious_remote_playlist_next(dbus_proxy); -} - -void playback_play(gint argc, gchar **argv) -{ - audacious_remote_play(dbus_proxy); -} - -void playback_pause(gint argc, gchar **argv) -{ - audacious_remote_pause(dbus_proxy); -} - -void playback_playpause(gint argc, gchar **argv) -{ - if (audacious_remote_is_playing(dbus_proxy)) - { - audacious_remote_pause(dbus_proxy); - } - else - { - audacious_remote_play(dbus_proxy); - } -} - -void playback_stop(gint argc, gchar **argv) -{ - audacious_remote_stop(dbus_proxy); -} - -void playback_playing(gint argc, gchar **argv) -{ - if (!audacious_remote_is_paused(dbus_proxy)) - { - exit(!audacious_remote_is_playing(dbus_proxy)); - } - else - { - exit(1); - } -} - -void playback_paused(gint argc, gchar **argv) -{ - exit(!audacious_remote_is_paused(dbus_proxy)); -} - -void playback_stopped(gint argc, gchar **argv) -{ - if (!audacious_remote_is_playing(dbus_proxy) && !audacious_remote_is_paused(dbus_proxy)) - { - exit(0); - } - else - { - exit(1); - } -} - -void playback_status(gint argc, gchar **argv) -{ - if (audacious_remote_is_paused(dbus_proxy)) - { - g_print("paused\n"); - return; - } - else if (audacious_remote_is_playing(dbus_proxy)) - { - g_print("playing\n"); - return; - } - else - { - g_print("stopped\n"); - return; - } -} - -void playback_seek(gint argc, gchar **argv) -{ - if (argc < 3) - { - g_print("%s: invalid parameters for playback-seek.\n", argv[0]); - g_print("%s: syntax: %s playback-seek \n", argv[0], argv[0]); - return; - } - - audacious_remote_jump_to_time(dbus_proxy, atoi(argv[2]) * 1000); -} - -void playback_seek_relative(gint argc, gchar **argv) -{ - gint oldtime, newtime, diff; - - if (argc < 3) - { - g_print("%s: invalid parameters for playback-seek-relative.\n", argv[0]); - g_print("%s: syntax: %s playback-seek \n", argv[0], argv[0]); - return; - } - - oldtime = audacious_remote_get_output_time(dbus_proxy); - diff = atoi(argv[2]) * 1000; - newtime = oldtime + diff; - - audacious_remote_jump_to_time(dbus_proxy, newtime); -} - -void playlist_add_url_string(gint argc, gchar **argv) -{ - if (argc < 3) - { - g_print("%s: invalid parameters for playlist-addurl.\n", argv[0]); - g_print("%s: syntax: %s playlist-addurl \n", argv[0], argv[0]); - return; - } - - audacious_remote_playlist_add_url_string(dbus_proxy, argv[2]); -} - -void playlist_delete(gint argc, gchar **argv) -{ - gint playpos; - - if (argc < 3) - { - g_print("%s: invalid parameters for playlist-delete.\n", argv[0]); - g_print("%s: syntax: %s playlist-delete \n", argv[0], argv[0]); - return; - } - - playpos = atoi(argv[2]); - - if (playpos < 1 || playpos > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], playpos); - return; - } - - audacious_remote_playlist_delete(dbus_proxy, playpos - 1); -} - -void playlist_length(gint argc, gchar **argv) -{ - gint i; - - i = audacious_remote_get_playlist_length(dbus_proxy); - - g_print("%d\n", i); -} - -void playlist_song(gint argc, gchar **argv) -{ - gint playpos; - gchar *song; - - if (argc < 3) - { - g_print("%s: invalid parameters for playlist-song-title.\n", argv[0]); - g_print("%s: syntax: %s playlist-song-title \n", argv[0], argv[0]); - return; - } - - playpos = atoi(argv[2]); - - if (playpos < 1 || playpos > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], playpos); - return; - } - - song = audacious_remote_get_playlist_title(dbus_proxy, playpos - 1); - - g_print("%s\n", song); -} - - -void playlist_song_length(gint argc, gchar **argv) -{ - gint playpos, frames, length; - - if (argc < 3) - { - g_print("%s: invalid parameters for playlist-song-length.\n", argv[0]); - g_print("%s: syntax: %s playlist-song-length \n", argv[0], argv[0]); - return; - } - - playpos = atoi(argv[2]); - - if (playpos < 1 || playpos > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], playpos); - return; - } - - frames = audacious_remote_get_playlist_time(dbus_proxy, playpos - 1); - length = frames / 1000; - - g_print("%d:%.2d\n", length / 60, length % 60); -} - -void playlist_song_length_seconds(gint argc, gchar **argv) -{ - gint playpos, frames, length; - - if (argc < 3) - { - g_print("%s: invalid parameters for playlist-song-length-seconds.\n", argv[0]); - g_print("%s: syntax: %s playlist-song-length-seconds \n", argv[0], argv[0]); - return; - } - - playpos = atoi(argv[2]); - - if (playpos < 1 || playpos > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], playpos); - return; - } - - frames = audacious_remote_get_playlist_time(dbus_proxy, playpos - 1); - length = frames / 1000; - - g_print("%d\n", length); -} - -void playlist_song_length_frames(gint argc, gchar **argv) -{ - gint playpos, frames; - - if (argc < 3) - { - g_print("%s: invalid parameters for playlist-song-length-frames.\n", argv[0]); - g_print("%s: syntax: %s playlist-song-length-frames \n", argv[0], argv[0]); - return; - } - - playpos = atoi(argv[2]); - - if (playpos < 1 || playpos > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], playpos); - return; - } - - frames = audacious_remote_get_playlist_time(dbus_proxy, playpos - 1); - - g_print("%d\n", frames); -} - -void playlist_display(gint argc, gchar **argv) -{ - gint i, ii, frames, length, total; - gchar *songname; - gchar *fmt = NULL, *p; - gint column; - - i = audacious_remote_get_playlist_length(dbus_proxy); - - g_print("%d tracks.\n", i); - - total = 0; - - for (ii = 0; ii < i; ii++) - { - songname = audacious_remote_get_playlist_title(dbus_proxy, ii); - frames = audacious_remote_get_playlist_time(dbus_proxy, ii); - length = frames / 1000; - total += length; - - /* adjust width for multi byte characters */ - column = 60; - if(songname){ - p = songname; - while(*p){ - gint stride; - stride = g_utf8_next_char(p) - p; - if(g_unichar_iswide(g_utf8_get_char(p)) -#if ( (GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION >= 12) ) - || g_unichar_iswide_cjk(g_utf8_get_char(p)) -#endif - ){ - column += (stride - 2); - } - else { - column += (stride - 1); - } - p = g_utf8_next_char(p); - } - - } - - fmt = g_strdup_printf("%%4d | %%-%ds | %%d:%%.2d\n", column); - g_print(fmt, ii + 1, songname, length / 60, length % 60); - g_free(fmt); - } - - g_print("Total length: %d:%.2d\n", total / 60, total % 60); -} - -void playlist_position(gint argc, gchar **argv) -{ - gint i; - - i = audacious_remote_get_playlist_pos(dbus_proxy); - - g_print("%d\n", i + 1); -} - -void playlist_song_filename(gint argc, gchar **argv) -{ - gint i; - - if (argc < 3) - { - g_print("%s: invalid parameters for playlist-filename.\n", argv[0]); - g_print("%s: syntax: %s playlist-filename \n", argv[0], argv[0]); - return; - } - - i = atoi(argv[2]); - - if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], i); - return; - } - - g_print("%s\n", audacious_remote_get_playlist_file(dbus_proxy, i - 1)); -} - -void playlist_jump(gint argc, gchar **argv) -{ - gint i; - - if (argc < 3) - { - g_print("%s: invalid parameters for playlist-jump.\n", argv[0]); - g_print("%s: syntax: %s playlist-jump \n", argv[0], argv[0]); - return; - } - - i = atoi(argv[2]); - - if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], i); - return; - } - - audacious_remote_set_playlist_pos(dbus_proxy, i - 1); -} - -void playlist_clear(gint argc, gchar **argv) -{ - audacious_remote_playlist_clear(dbus_proxy); -} - -void playlist_repeat_status(gint argc, gchar **argv) -{ - if (audacious_remote_is_repeat(dbus_proxy)) - { - g_print("on\n"); - return; - } - else - { - g_print("off\n"); - return; - } -} - -void playlist_repeat_toggle(gint argc, gchar **argv) -{ - audacious_remote_toggle_repeat(dbus_proxy); -} - -void playlist_shuffle_status(gint argc, gchar **argv) -{ - if (audacious_remote_is_shuffle(dbus_proxy)) - { - g_print("on\n"); - return; - } - else - { - g_print("off\n"); - return; - } -} - -void playlist_shuffle_toggle(gint argc, gchar **argv) -{ - audacious_remote_toggle_shuffle(dbus_proxy); -} - -void playlist_tuple_field_data(gint argc, gchar **argv) -{ - gint i; - gpointer data; - - if (argc < 4) - { - g_print("%s: invalid parameters for playlist-tuple-data.\n", argv[0]); - g_print("%s: syntax: %s playlist-tuple-data \n", argv[0], argv[0]); - g_print("%s: - fieldname example choices: performer, album_name,\n", argv[0]); - g_print("%s: track_name, track_number, year, date, genre, comment,\n", argv[0]); - g_print("%s: file_name, file_ext, file_path, length, formatter,\n", argv[0]); - g_print("%s: custom, mtime\n", argv[0]); - return; - } - - i = atoi(argv[3]); - - if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], i); - return; - } - - if (!(data = audacious_get_tuple_field_data(dbus_proxy, argv[2], i - 1))) - { - return; - } - - if (!strcasecmp(argv[2], "track_number") || !strcasecmp(argv[2], "year") || !strcasecmp(argv[2], "length") || !strcasecmp(argv[2], "mtime")) - { - if (*(gint *)data > 0) - { - g_print("%d\n", *(gint *)data); - } - return; - } - - g_print("%s\n", (gchar *)data); -} - -void playqueue_add(gint argc, gchar **argv) -{ - gint i; - - if (argc < 3) - { - g_print("%s: invalid parameters for playqueue-add.\n", argv[0]); - g_print("%s: syntax: %s playqueue-add \n", argv[0], argv[0]); - return; - } - - i = atoi(argv[2]); - - if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], i); - return; - } - - if (!(audacious_remote_playqueue_is_queued(dbus_proxy, i - 1))) - audacious_remote_playqueue_add(dbus_proxy, i - 1); -} - -void playqueue_remove(gint argc, gchar **argv) -{ - gint i; - - if (argc < 3) - { - g_print("%s: invalid parameters for playqueue-remove.\n", argv[0]); - g_print("%s: syntax: %s playqueue-remove \n", argv[0], argv[0]); - return; - } - - i = atoi(argv[2]); - - if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], i); - return; - } - - if (audacious_remote_playqueue_is_queued(dbus_proxy, i - 1)) - audacious_remote_playqueue_remove(dbus_proxy, i - 1); -} - -void playqueue_is_queued(gint argc, gchar **argv) -{ - gint i; - - if (argc < 3) - { - g_print("%s: invalid parameters for playqueue-is-queued.\n", argv[0]); - g_print("%s: syntax: %s playqueue-is-queued \n", argv[0], argv[0]); - return; - } - - i = atoi(argv[2]); - - if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], i); - return; - } - - exit(!(audacious_remote_playqueue_is_queued(dbus_proxy, i - 1))); -} - -void playqueue_get_position(gint argc, gchar **argv) -{ - gint i, pos; - - if (argc < 3) - { - g_print("%s: invalid parameters for playqueue-get-position.\n", argv[0]); - g_print("%s: syntax: %s playqueue-get-position \n", argv[0], argv[0]); - return; - } - - i = atoi(argv[2]); - - if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], i); - return; - } - - pos = audacious_remote_get_playqueue_position(dbus_proxy, i - 1) + 1; - - if (pos < 1) - return; - - g_print("%d\n", pos); -} - -void playqueue_get_qposition(gint argc, gchar **argv) -{ - gint i, pos; - - if (argc < 3) - { - g_print("%s: invalid parameters for playqueue-get-qposition.\n", argv[0]); - g_print("%s: syntax: %s playqueue-get-qposition \n", argv[0], argv[0]); - return; - } - - i = atoi(argv[2]); - - if (i < 1 || i > audacious_remote_get_playqueue_length(dbus_proxy)) - { - g_print("%s: invalid playlist position %d\n", argv[0], i); - return; - } - - pos = audacious_remote_get_playqueue_queue_position(dbus_proxy, i - 1) + 1; - - if (pos < 1) - return; - - g_print("%d\n", pos); -} - -void playqueue_display(gint argc, gchar **argv) -{ - gint i, ii, position, frames, length, total; - gchar *songname; - gchar *fmt = NULL, *p; - gint column; - - i = audacious_remote_get_playqueue_length(dbus_proxy); - - g_print("%d queued tracks.\n", i); - - total = 0; - - for (ii = 0; ii < i; ii++) - { - position = audacious_remote_get_playqueue_queue_position(dbus_proxy, ii); - songname = audacious_remote_get_playlist_title(dbus_proxy, position); - frames = audacious_remote_get_playlist_time(dbus_proxy, position); - length = frames / 1000; - total += length; - - /* adjust width for multi byte characters */ - column = 60; - if(songname) { - p = songname; - while(*p){ - gint stride; - stride = g_utf8_next_char(p) - p; - if(g_unichar_iswide(g_utf8_get_char(p)) -#if ( (GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION >= 12) ) - || g_unichar_iswide_cjk(g_utf8_get_char(p)) -#endif - ){ - column += (stride - 2); - } - else { - column += (stride - 1); - } - p = g_utf8_next_char(p); - } - } - - fmt = g_strdup_printf("%%4d | %%4d | %%-%ds | %%d:%%.2d\n", column); - g_print(fmt, ii + 1, position + 1, songname, length / 60, length % 60); - g_free(fmt); - } - - g_print("Total length: %d:%.2d\n", total / 60, total % 60); -} - -void playqueue_length(gint argc, gchar **argv) -{ - gint i; - - i = audacious_remote_get_playqueue_length(dbus_proxy); - - g_print("%d\n", i); -} - -void playqueue_clear(gint argc, gchar **argv) -{ - audacious_remote_playqueue_clear(dbus_proxy); -} - -void get_volume(gint argc, gchar **argv) -{ - gint i; - - i = audacious_remote_get_main_volume(dbus_proxy); - - g_print("%d\n", i); -} - -void set_volume(gint argc, gchar **argv) -{ - gint i, current_volume; - - if (argc < 3) - { - g_print("%s: invalid parameters for set-volume.\n", argv[0]); - g_print("%s: syntax: %s set-volume \n", argv[0], argv[0]); - return; - } - - current_volume = audacious_remote_get_main_volume(dbus_proxy); - switch (argv[2][0]) - { - case '+': - case '-': - i = current_volume + atoi(argv[2]); - break; - default: - i = atoi(argv[2]); - break; - } - - audacious_remote_set_main_volume(dbus_proxy, i); -} - -void mainwin_show(gint argc, gchar **argv) -{ - if (argc > 2) - { - if (!strncmp(argv[2],"on",2)) { - audacious_remote_main_win_toggle(dbus_proxy, TRUE); - return; - } - else if (!strncmp(argv[2],"off",3)) { - audacious_remote_main_win_toggle(dbus_proxy, FALSE); - return; - } - } - g_print("%s: invalid parameter for mainwin-show.\n",argv[0]); - g_print("%s: syntax: %s mainwin-show \n",argv[0],argv[0]); -} - -void playlist_show(gint argc, gchar **argv) -{ - if (argc > 2) - { - if (!strncmp(argv[2],"on",2)) { - audacious_remote_pl_win_toggle(dbus_proxy, TRUE); - return; - } - else if (!strncmp(argv[2],"off",3)) { - audacious_remote_pl_win_toggle(dbus_proxy, FALSE); - return; - } - } - g_print("%s: invalid parameter for playlist-show.\n",argv[0]); - g_print("%s: syntax: %s playlist-show \n",argv[0],argv[0]); -} - -void equalizer_show(gint argc, gchar **argv) -{ - if (argc > 2) - { - if (!strncmp(argv[2],"on",2)) { - audacious_remote_eq_win_toggle(dbus_proxy, TRUE); - return; - } - else if (!strncmp(argv[2],"off",3)) { - audacious_remote_eq_win_toggle(dbus_proxy, FALSE); - return; - } - } - g_print("%s: invalid parameter for equalizer-show.\n",argv[0]); - g_print("%s: syntax: %s equalizer-show \n",argv[0],argv[0]); -} - -void show_preferences_window(gint argc, gchar **argv) -{ - audacious_remote_show_prefs_box(dbus_proxy); -} - -void show_jtf_window(gint argc, gchar **argv) -{ - audacious_remote_show_jtf_box(dbus_proxy); -} - -void shutdown_audacious_server(gint argc, gchar **argv) -{ - audacious_remote_quit(dbus_proxy); -} - -void get_handlers_list(gint argc, gchar **argv) -{ - gint i; - - for (i = 0; handlers[i].name != NULL; i++) - { - if (!g_strcasecmp("", handlers[i].name)) - g_print("%s%s:\n", i == 0 ? "" : "\n", handlers[i].desc); - else - g_print(" %-34s - %s\n", handlers[i].name, handlers[i].desc); - } - - g_print("\nHandlers may be prefixed with `--' (GNU-style long-options) or not, your choice.\n"); - g_print("Report bugs to http://bugs-meta.atheme.org/\n"); -} diff -r 8249a1248a09 -r b189991f7417 src/audtool/audtool.h --- a/src/audtool/audtool.h Fri May 11 12:39:47 2007 -0700 +++ b/src/audtool/audtool.h Fri May 11 12:49:05 2007 -0700 @@ -19,14 +19,20 @@ #ifndef AUDTOOL_H #define AUDTOOL_H +#include #include +extern mowgli_error_context_t *e; +extern DBusGProxy *dbus_proxy; + struct commandhandler { gchar *name; void (*handler)(gint argc, gchar **argv); gchar *desc; }; +extern struct commandhandler handlers[]; + extern void get_handlers_list(gint, gchar **); extern void get_current_song(gint, gchar **); extern void get_current_song_filename(gint, gchar **); diff -r 8249a1248a09 -r b189991f7417 src/audtool/handlers.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/audtool/handlers.c Fri May 11 12:49:05 2007 -0700 @@ -0,0 +1,933 @@ +/* + * Audtool2 + * Copyright (c) 2007 Audacious development team + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include "libaudclient/audctrl.h" +#include "audtool.h" + +void get_current_song(gint argc, gchar **argv) +{ + gint playpos = audacious_remote_get_playlist_pos(dbus_proxy); + gchar *song = audacious_remote_get_playlist_title(dbus_proxy, playpos); + + if (!song) + { + g_print("No song playing.\n"); + return; + } + + g_print("%s\n", song); +} + +void get_current_song_filename(gint argc, gchar **argv) +{ + gint playpos = audacious_remote_get_playlist_pos(dbus_proxy); + + g_print("%s\n", audacious_remote_get_playlist_file(dbus_proxy, playpos)); +} + +void get_current_song_output_length(gint argc, gchar **argv) +{ + gint frames = audacious_remote_get_output_time(dbus_proxy); + gint length = frames / 1000; + + g_print("%d:%.2d\n", length / 60, length % 60); +} + +void get_current_song_output_length_seconds(gint argc, gchar **argv) +{ + gint frames = audacious_remote_get_output_time(dbus_proxy); + gint length = frames / 1000; + + g_print("%d\n", length); +} + +void get_current_song_output_length_frames(gint argc, gchar **argv) +{ + gint frames = audacious_remote_get_output_time(dbus_proxy); + + g_print("%d\n", frames); +} + +void get_current_song_length(gint argc, gchar **argv) +{ + gint playpos = audacious_remote_get_playlist_pos(dbus_proxy); + gint frames = audacious_remote_get_playlist_time(dbus_proxy, playpos); + gint length = frames / 1000; + + g_print("%d:%.2d\n", length / 60, length % 60); +} + +void get_current_song_length_seconds(gint argc, gchar **argv) +{ + gint playpos = audacious_remote_get_playlist_pos(dbus_proxy); + gint frames = audacious_remote_get_playlist_time(dbus_proxy, playpos); + gint length = frames / 1000; + + g_print("%d\n", length); +} + +void get_current_song_length_frames(gint argc, gchar **argv) +{ + gint playpos = audacious_remote_get_playlist_pos(dbus_proxy); + gint frames = audacious_remote_get_playlist_time(dbus_proxy, playpos); + + g_print("%d\n", frames); +} + +void get_current_song_bitrate(gint argc, gchar **argv) +{ + gint rate, freq, nch; + + audacious_remote_get_info(dbus_proxy, &rate, &freq, &nch); + + g_print("%d\n", rate); +} + +void get_current_song_bitrate_kbps(gint argc, gchar **argv) +{ + gint rate, freq, nch; + + audacious_remote_get_info(dbus_proxy, &rate, &freq, &nch); + + g_print("%d\n", rate / 1000); +} + +void get_current_song_frequency(gint argc, gchar **argv) +{ + gint rate, freq, nch; + + audacious_remote_get_info(dbus_proxy, &rate, &freq, &nch); + + g_print("%d\n", freq); +} + +void get_current_song_frequency_khz(gint argc, gchar **argv) +{ + gint rate, freq, nch; + + audacious_remote_get_info(dbus_proxy, &rate, &freq, &nch); + + g_print("%0.1f\n", (gfloat) freq / 1000); +} + +void get_current_song_channels(gint argc, gchar **argv) +{ + gint rate, freq, nch; + + audacious_remote_get_info(dbus_proxy, &rate, &freq, &nch); + + g_print("%d\n", nch); +} + +void get_current_song_tuple_field_data(gint argc, gchar **argv) +{ + gpointer data; + + if (argc < 3) + { + g_print("%s: invalid parameters for current-song-tuple-data.\n", argv[0]); + g_print("%s: syntax: %s current-song-tuple-data \n", argv[0], argv[0]); + g_print("%s: - fieldname example choices: performer, album_name,\n", argv[0]); + g_print("%s: track_name, track_number, year, date, genre, comment,\n", argv[0]); + g_print("%s: file_name, file_ext, file_path, length, formatter,\n", argv[0]); + g_print("%s: custom, mtime\n", argv[0]); + return; + } + + if (!(data = audacious_get_tuple_field_data(dbus_proxy, argv[2], audacious_remote_get_playlist_pos(dbus_proxy)))) + { + return; + } + + if (!strcasecmp(argv[2], "track_number") || !strcasecmp(argv[2], "year") || !strcasecmp(argv[2], "length") || !strcasecmp(argv[2], "mtime")) + { + if (*(gint *)data > 0) + { + g_print("%d\n", *(gint *)data); + } + return; + } + + g_print("%s\n", (gchar *)data); +} + +void playlist_reverse(gint argc, gchar **argv) +{ + audacious_remote_playlist_prev(dbus_proxy); +} + +void playlist_advance(gint argc, gchar **argv) +{ + audacious_remote_playlist_next(dbus_proxy); +} + +void playback_play(gint argc, gchar **argv) +{ + audacious_remote_play(dbus_proxy); +} + +void playback_pause(gint argc, gchar **argv) +{ + audacious_remote_pause(dbus_proxy); +} + +void playback_playpause(gint argc, gchar **argv) +{ + if (audacious_remote_is_playing(dbus_proxy)) + { + audacious_remote_pause(dbus_proxy); + } + else + { + audacious_remote_play(dbus_proxy); + } +} + +void playback_stop(gint argc, gchar **argv) +{ + audacious_remote_stop(dbus_proxy); +} + +void playback_playing(gint argc, gchar **argv) +{ + if (!audacious_remote_is_paused(dbus_proxy)) + { + exit(!audacious_remote_is_playing(dbus_proxy)); + } + else + { + exit(1); + } +} + +void playback_paused(gint argc, gchar **argv) +{ + exit(!audacious_remote_is_paused(dbus_proxy)); +} + +void playback_stopped(gint argc, gchar **argv) +{ + if (!audacious_remote_is_playing(dbus_proxy) && !audacious_remote_is_paused(dbus_proxy)) + { + exit(0); + } + else + { + exit(1); + } +} + +void playback_status(gint argc, gchar **argv) +{ + if (audacious_remote_is_paused(dbus_proxy)) + { + g_print("paused\n"); + return; + } + else if (audacious_remote_is_playing(dbus_proxy)) + { + g_print("playing\n"); + return; + } + else + { + g_print("stopped\n"); + return; + } +} + +void playback_seek(gint argc, gchar **argv) +{ + if (argc < 3) + { + g_print("%s: invalid parameters for playback-seek.\n", argv[0]); + g_print("%s: syntax: %s playback-seek \n", argv[0], argv[0]); + return; + } + + audacious_remote_jump_to_time(dbus_proxy, atoi(argv[2]) * 1000); +} + +void playback_seek_relative(gint argc, gchar **argv) +{ + gint oldtime, newtime, diff; + + if (argc < 3) + { + g_print("%s: invalid parameters for playback-seek-relative.\n", argv[0]); + g_print("%s: syntax: %s playback-seek \n", argv[0], argv[0]); + return; + } + + oldtime = audacious_remote_get_output_time(dbus_proxy); + diff = atoi(argv[2]) * 1000; + newtime = oldtime + diff; + + audacious_remote_jump_to_time(dbus_proxy, newtime); +} + +void playlist_add_url_string(gint argc, gchar **argv) +{ + if (argc < 3) + { + g_print("%s: invalid parameters for playlist-addurl.\n", argv[0]); + g_print("%s: syntax: %s playlist-addurl \n", argv[0], argv[0]); + return; + } + + audacious_remote_playlist_add_url_string(dbus_proxy, argv[2]); +} + +void playlist_delete(gint argc, gchar **argv) +{ + gint playpos; + + if (argc < 3) + { + g_print("%s: invalid parameters for playlist-delete.\n", argv[0]); + g_print("%s: syntax: %s playlist-delete \n", argv[0], argv[0]); + return; + } + + playpos = atoi(argv[2]); + + if (playpos < 1 || playpos > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], playpos); + return; + } + + audacious_remote_playlist_delete(dbus_proxy, playpos - 1); +} + +void playlist_length(gint argc, gchar **argv) +{ + gint i; + + i = audacious_remote_get_playlist_length(dbus_proxy); + + g_print("%d\n", i); +} + +void playlist_song(gint argc, gchar **argv) +{ + gint playpos; + gchar *song; + + if (argc < 3) + { + g_print("%s: invalid parameters for playlist-song-title.\n", argv[0]); + g_print("%s: syntax: %s playlist-song-title \n", argv[0], argv[0]); + return; + } + + playpos = atoi(argv[2]); + + if (playpos < 1 || playpos > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], playpos); + return; + } + + song = audacious_remote_get_playlist_title(dbus_proxy, playpos - 1); + + g_print("%s\n", song); +} + + +void playlist_song_length(gint argc, gchar **argv) +{ + gint playpos, frames, length; + + if (argc < 3) + { + g_print("%s: invalid parameters for playlist-song-length.\n", argv[0]); + g_print("%s: syntax: %s playlist-song-length \n", argv[0], argv[0]); + return; + } + + playpos = atoi(argv[2]); + + if (playpos < 1 || playpos > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], playpos); + return; + } + + frames = audacious_remote_get_playlist_time(dbus_proxy, playpos - 1); + length = frames / 1000; + + g_print("%d:%.2d\n", length / 60, length % 60); +} + +void playlist_song_length_seconds(gint argc, gchar **argv) +{ + gint playpos, frames, length; + + if (argc < 3) + { + g_print("%s: invalid parameters for playlist-song-length-seconds.\n", argv[0]); + g_print("%s: syntax: %s playlist-song-length-seconds \n", argv[0], argv[0]); + return; + } + + playpos = atoi(argv[2]); + + if (playpos < 1 || playpos > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], playpos); + return; + } + + frames = audacious_remote_get_playlist_time(dbus_proxy, playpos - 1); + length = frames / 1000; + + g_print("%d\n", length); +} + +void playlist_song_length_frames(gint argc, gchar **argv) +{ + gint playpos, frames; + + if (argc < 3) + { + g_print("%s: invalid parameters for playlist-song-length-frames.\n", argv[0]); + g_print("%s: syntax: %s playlist-song-length-frames \n", argv[0], argv[0]); + return; + } + + playpos = atoi(argv[2]); + + if (playpos < 1 || playpos > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], playpos); + return; + } + + frames = audacious_remote_get_playlist_time(dbus_proxy, playpos - 1); + + g_print("%d\n", frames); +} + +void playlist_display(gint argc, gchar **argv) +{ + gint i, ii, frames, length, total; + gchar *songname; + gchar *fmt = NULL, *p; + gint column; + + i = audacious_remote_get_playlist_length(dbus_proxy); + + g_print("%d tracks.\n", i); + + total = 0; + + for (ii = 0; ii < i; ii++) + { + songname = audacious_remote_get_playlist_title(dbus_proxy, ii); + frames = audacious_remote_get_playlist_time(dbus_proxy, ii); + length = frames / 1000; + total += length; + + /* adjust width for multi byte characters */ + column = 60; + if(songname){ + p = songname; + while(*p){ + gint stride; + stride = g_utf8_next_char(p) - p; + if(g_unichar_iswide(g_utf8_get_char(p)) +#if ( (GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION >= 12) ) + || g_unichar_iswide_cjk(g_utf8_get_char(p)) +#endif + ){ + column += (stride - 2); + } + else { + column += (stride - 1); + } + p = g_utf8_next_char(p); + } + + } + + fmt = g_strdup_printf("%%4d | %%-%ds | %%d:%%.2d\n", column); + g_print(fmt, ii + 1, songname, length / 60, length % 60); + g_free(fmt); + } + + g_print("Total length: %d:%.2d\n", total / 60, total % 60); +} + +void playlist_position(gint argc, gchar **argv) +{ + gint i; + + i = audacious_remote_get_playlist_pos(dbus_proxy); + + g_print("%d\n", i + 1); +} + +void playlist_song_filename(gint argc, gchar **argv) +{ + gint i; + + if (argc < 3) + { + g_print("%s: invalid parameters for playlist-filename.\n", argv[0]); + g_print("%s: syntax: %s playlist-filename \n", argv[0], argv[0]); + return; + } + + i = atoi(argv[2]); + + if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], i); + return; + } + + g_print("%s\n", audacious_remote_get_playlist_file(dbus_proxy, i - 1)); +} + +void playlist_jump(gint argc, gchar **argv) +{ + gint i; + + if (argc < 3) + { + g_print("%s: invalid parameters for playlist-jump.\n", argv[0]); + g_print("%s: syntax: %s playlist-jump \n", argv[0], argv[0]); + return; + } + + i = atoi(argv[2]); + + if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], i); + return; + } + + audacious_remote_set_playlist_pos(dbus_proxy, i - 1); +} + +void playlist_clear(gint argc, gchar **argv) +{ + audacious_remote_playlist_clear(dbus_proxy); +} + +void playlist_repeat_status(gint argc, gchar **argv) +{ + if (audacious_remote_is_repeat(dbus_proxy)) + { + g_print("on\n"); + return; + } + else + { + g_print("off\n"); + return; + } +} + +void playlist_repeat_toggle(gint argc, gchar **argv) +{ + audacious_remote_toggle_repeat(dbus_proxy); +} + +void playlist_shuffle_status(gint argc, gchar **argv) +{ + if (audacious_remote_is_shuffle(dbus_proxy)) + { + g_print("on\n"); + return; + } + else + { + g_print("off\n"); + return; + } +} + +void playlist_shuffle_toggle(gint argc, gchar **argv) +{ + audacious_remote_toggle_shuffle(dbus_proxy); +} + +void playlist_tuple_field_data(gint argc, gchar **argv) +{ + gint i; + gpointer data; + + if (argc < 4) + { + g_print("%s: invalid parameters for playlist-tuple-data.\n", argv[0]); + g_print("%s: syntax: %s playlist-tuple-data \n", argv[0], argv[0]); + g_print("%s: - fieldname example choices: performer, album_name,\n", argv[0]); + g_print("%s: track_name, track_number, year, date, genre, comment,\n", argv[0]); + g_print("%s: file_name, file_ext, file_path, length, formatter,\n", argv[0]); + g_print("%s: custom, mtime\n", argv[0]); + return; + } + + i = atoi(argv[3]); + + if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], i); + return; + } + + if (!(data = audacious_get_tuple_field_data(dbus_proxy, argv[2], i - 1))) + { + return; + } + + if (!strcasecmp(argv[2], "track_number") || !strcasecmp(argv[2], "year") || !strcasecmp(argv[2], "length") || !strcasecmp(argv[2], "mtime")) + { + if (*(gint *)data > 0) + { + g_print("%d\n", *(gint *)data); + } + return; + } + + g_print("%s\n", (gchar *)data); +} + +void playqueue_add(gint argc, gchar **argv) +{ + gint i; + + if (argc < 3) + { + g_print("%s: invalid parameters for playqueue-add.\n", argv[0]); + g_print("%s: syntax: %s playqueue-add \n", argv[0], argv[0]); + return; + } + + i = atoi(argv[2]); + + if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], i); + return; + } + + if (!(audacious_remote_playqueue_is_queued(dbus_proxy, i - 1))) + audacious_remote_playqueue_add(dbus_proxy, i - 1); +} + +void playqueue_remove(gint argc, gchar **argv) +{ + gint i; + + if (argc < 3) + { + g_print("%s: invalid parameters for playqueue-remove.\n", argv[0]); + g_print("%s: syntax: %s playqueue-remove \n", argv[0], argv[0]); + return; + } + + i = atoi(argv[2]); + + if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], i); + return; + } + + if (audacious_remote_playqueue_is_queued(dbus_proxy, i - 1)) + audacious_remote_playqueue_remove(dbus_proxy, i - 1); +} + +void playqueue_is_queued(gint argc, gchar **argv) +{ + gint i; + + if (argc < 3) + { + g_print("%s: invalid parameters for playqueue-is-queued.\n", argv[0]); + g_print("%s: syntax: %s playqueue-is-queued \n", argv[0], argv[0]); + return; + } + + i = atoi(argv[2]); + + if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], i); + return; + } + + exit(!(audacious_remote_playqueue_is_queued(dbus_proxy, i - 1))); +} + +void playqueue_get_position(gint argc, gchar **argv) +{ + gint i, pos; + + if (argc < 3) + { + g_print("%s: invalid parameters for playqueue-get-position.\n", argv[0]); + g_print("%s: syntax: %s playqueue-get-position \n", argv[0], argv[0]); + return; + } + + i = atoi(argv[2]); + + if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], i); + return; + } + + pos = audacious_remote_get_playqueue_position(dbus_proxy, i - 1) + 1; + + if (pos < 1) + return; + + g_print("%d\n", pos); +} + +void playqueue_get_qposition(gint argc, gchar **argv) +{ + gint i, pos; + + if (argc < 3) + { + g_print("%s: invalid parameters for playqueue-get-qposition.\n", argv[0]); + g_print("%s: syntax: %s playqueue-get-qposition \n", argv[0], argv[0]); + return; + } + + i = atoi(argv[2]); + + if (i < 1 || i > audacious_remote_get_playqueue_length(dbus_proxy)) + { + g_print("%s: invalid playlist position %d\n", argv[0], i); + return; + } + + pos = audacious_remote_get_playqueue_queue_position(dbus_proxy, i - 1) + 1; + + if (pos < 1) + return; + + g_print("%d\n", pos); +} + +void playqueue_display(gint argc, gchar **argv) +{ + gint i, ii, position, frames, length, total; + gchar *songname; + gchar *fmt = NULL, *p; + gint column; + + i = audacious_remote_get_playqueue_length(dbus_proxy); + + g_print("%d queued tracks.\n", i); + + total = 0; + + for (ii = 0; ii < i; ii++) + { + position = audacious_remote_get_playqueue_queue_position(dbus_proxy, ii); + songname = audacious_remote_get_playlist_title(dbus_proxy, position); + frames = audacious_remote_get_playlist_time(dbus_proxy, position); + length = frames / 1000; + total += length; + + /* adjust width for multi byte characters */ + column = 60; + if(songname) { + p = songname; + while(*p){ + gint stride; + stride = g_utf8_next_char(p) - p; + if(g_unichar_iswide(g_utf8_get_char(p)) +#if ( (GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION >= 12) ) + || g_unichar_iswide_cjk(g_utf8_get_char(p)) +#endif + ){ + column += (stride - 2); + } + else { + column += (stride - 1); + } + p = g_utf8_next_char(p); + } + } + + fmt = g_strdup_printf("%%4d | %%4d | %%-%ds | %%d:%%.2d\n", column); + g_print(fmt, ii + 1, position + 1, songname, length / 60, length % 60); + g_free(fmt); + } + + g_print("Total length: %d:%.2d\n", total / 60, total % 60); +} + +void playqueue_length(gint argc, gchar **argv) +{ + gint i; + + i = audacious_remote_get_playqueue_length(dbus_proxy); + + g_print("%d\n", i); +} + +void playqueue_clear(gint argc, gchar **argv) +{ + audacious_remote_playqueue_clear(dbus_proxy); +} + +void get_volume(gint argc, gchar **argv) +{ + gint i; + + i = audacious_remote_get_main_volume(dbus_proxy); + + g_print("%d\n", i); +} + +void set_volume(gint argc, gchar **argv) +{ + gint i, current_volume; + + if (argc < 3) + { + g_print("%s: invalid parameters for set-volume.\n", argv[0]); + g_print("%s: syntax: %s set-volume \n", argv[0], argv[0]); + return; + } + + current_volume = audacious_remote_get_main_volume(dbus_proxy); + switch (argv[2][0]) + { + case '+': + case '-': + i = current_volume + atoi(argv[2]); + break; + default: + i = atoi(argv[2]); + break; + } + + audacious_remote_set_main_volume(dbus_proxy, i); +} + +void mainwin_show(gint argc, gchar **argv) +{ + if (argc > 2) + { + if (!strncmp(argv[2],"on",2)) { + audacious_remote_main_win_toggle(dbus_proxy, TRUE); + return; + } + else if (!strncmp(argv[2],"off",3)) { + audacious_remote_main_win_toggle(dbus_proxy, FALSE); + return; + } + } + g_print("%s: invalid parameter for mainwin-show.\n",argv[0]); + g_print("%s: syntax: %s mainwin-show \n",argv[0],argv[0]); +} + +void playlist_show(gint argc, gchar **argv) +{ + if (argc > 2) + { + if (!strncmp(argv[2],"on",2)) { + audacious_remote_pl_win_toggle(dbus_proxy, TRUE); + return; + } + else if (!strncmp(argv[2],"off",3)) { + audacious_remote_pl_win_toggle(dbus_proxy, FALSE); + return; + } + } + g_print("%s: invalid parameter for playlist-show.\n",argv[0]); + g_print("%s: syntax: %s playlist-show \n",argv[0],argv[0]); +} + +void equalizer_show(gint argc, gchar **argv) +{ + if (argc > 2) + { + if (!strncmp(argv[2],"on",2)) { + audacious_remote_eq_win_toggle(dbus_proxy, TRUE); + return; + } + else if (!strncmp(argv[2],"off",3)) { + audacious_remote_eq_win_toggle(dbus_proxy, FALSE); + return; + } + } + g_print("%s: invalid parameter for equalizer-show.\n",argv[0]); + g_print("%s: syntax: %s equalizer-show \n",argv[0],argv[0]); +} + +void show_preferences_window(gint argc, gchar **argv) +{ + audacious_remote_show_prefs_box(dbus_proxy); +} + +void show_jtf_window(gint argc, gchar **argv) +{ + audacious_remote_show_jtf_box(dbus_proxy); +} + +void shutdown_audacious_server(gint argc, gchar **argv) +{ + audacious_remote_quit(dbus_proxy); +} + +void get_handlers_list(gint argc, gchar **argv) +{ + gint i; + + for (i = 0; handlers[i].name != NULL; i++) + { + if (!g_strcasecmp("", handlers[i].name)) + g_print("%s%s:\n", i == 0 ? "" : "\n", handlers[i].desc); + else + g_print(" %-34s - %s\n", handlers[i].name, handlers[i].desc); + } + + g_print("\nHandlers may be prefixed with `--' (GNU-style long-options) or not, your choice.\n"); + g_print("Report bugs to http://bugs-meta.atheme.org/\n"); +}