# HG changeset patch
# User nenolod
# Date 1167623849 28800
# Node ID 894f7aa46f83b998e55ef8b6659076a019afa956
# Parent  649e3418aac283bb14e902d2c25e00c7f83875eb
[svn] - bmp_playback_* -> playback_* -- i knew something smelled rotten here, hmm.

diff -r 649e3418aac2 -r 894f7aa46f83 ChangeLog
--- a/ChangeLog	Sun Dec 31 11:40:27 2006 -0800
+++ b/ChangeLog	Sun Dec 31 19:57:29 2006 -0800
@@ -1,3 +1,17 @@
+2006-12-31 19:40:27 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3459]
+  - mark several tooltips in Preferences as translatable.
+  - mark other things as translatable too.
+  - add audacious/playlist_manager.c to POTFILES.in
+  Closes #716.
+  
+  trunk/audacious/glade/prefswin.glade |   38 +++++++++++++++++------------------
+  trunk/audacious/mainwin.c            |    4 +--
+  trunk/audacious/util.c               |    2 -
+  trunk/po/POTFILES.in                 |    1 
+  4 files changed, 23 insertions(+), 22 deletions(-)
+
+
 2006-12-31 19:32:05 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3457]
   - set the translation domain for UIManager owned objects. Closes #719, #720.
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/controlsocket.c
--- a/audacious/controlsocket.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/controlsocket.c	Sun Dec 31 19:57:29 2006 -0800
@@ -373,11 +373,11 @@
             ctrl_ack_packet(pkt);
             break;
         case CMD_IS_PLAYING:
-            ctrl_write_gboolean(pkt->fd, bmp_playback_get_playing());
+            ctrl_write_gboolean(pkt->fd, playback_get_playing());
             ctrl_ack_packet(pkt);
             break;
         case CMD_IS_PAUSED:
-            ctrl_write_gboolean(pkt->fd, bmp_playback_get_paused());
+            ctrl_write_gboolean(pkt->fd, playback_get_paused());
             ctrl_ack_packet(pkt);
             break;
         case CMD_GET_PLAYLIST_POS:
@@ -418,8 +418,8 @@
             ctrl_ack_packet(pkt);
             break;
         case CMD_GET_OUTPUT_TIME:
-            if (bmp_playback_get_playing())
-                ctrl_write_gint(pkt->fd, bmp_playback_get_time());
+            if (playback_get_playing())
+                ctrl_write_gint(pkt->fd, playback_get_time());
             else
                 ctrl_write_gint(pkt->fd, 0);
             ctrl_ack_packet(pkt);
@@ -626,27 +626,27 @@
 
         switch (pkt->hdr.command) {
         case CMD_PLAY:
-            if (bmp_playback_get_paused())
-                bmp_playback_pause();
+            if (playback_get_paused())
+                playback_pause();
             else if (playlist_get_length(playlist_get_active()))
-                bmp_playback_initiate();
+                playback_initiate();
             else
                 mainwin_eject_pushed();
             break;
         case CMD_PAUSE:
-            bmp_playback_pause();
+            playback_pause();
             break;
         case CMD_STOP:
             ip_data.stop = TRUE;
-            bmp_playback_stop();
+            playback_stop();
             ip_data.stop = FALSE;
             mainwin_clear_song_info();
             break;
         case CMD_PLAY_PAUSE:
-            if (bmp_playback_get_playing())
-                bmp_playback_pause();
+            if (playback_get_playing())
+                playback_pause();
             else
-                bmp_playback_initiate();
+                playback_initiate();
             break;
         case CMD_PLAYQUEUE_ADD:
             num = *((guint32 *) data);
@@ -670,7 +670,7 @@
             num = *((guint32 *) data);
             if (playlist_get_current_length(playlist_get_active()) > 0 &&
                 num < (guint)playlist_get_current_length(playlist_get_active()))
-                bmp_playback_seek(num / 1000);
+                playback_seek(num / 1000);
             break;
         case CMD_SET_VOLUME:
             v[0] = ((guint32 *) data)[0];
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/genevent.c
--- a/audacious/genevent.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/genevent.c	Sun Dec 31 19:57:29 2006 -0800
@@ -130,8 +130,8 @@
 
     ctrlsocket_check();
 
-    if (bmp_playback_get_playing()) {
-        time = bmp_playback_get_time();
+    if (playback_get_playing()) {
+        time = playback_get_time();
 
         switch (time) {
         case -1:
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/input.c
--- a/audacious/input.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/input.c	Sun Dec 31 19:57:29 2006 -0800
@@ -728,7 +728,7 @@
 {
     *l = -1;
     *r = -1;
-    if (bmp_playback_get_playing()) {
+    if (playback_get_playing()) {
         if (get_current_input_plugin() &&
             get_current_input_plugin()->get_volume) {
             get_current_input_plugin()->get_volume(l, r);
@@ -741,7 +741,7 @@
 void
 input_set_volume(gint l, gint r)
 {
-    if (bmp_playback_get_playing()) {
+    if (playback_get_playing()) {
         if (get_current_input_plugin() &&
             get_current_input_plugin()->set_volume) {
             get_current_input_plugin()->set_volume(l, r);
@@ -804,7 +804,7 @@
 void
 input_set_status_buffering(gboolean status)
 {
-    if (!bmp_playback_get_playing())
+    if (!playback_get_playing())
         return;
 
     if (!get_current_input_plugin())
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/main.c
--- a/audacious/main.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/main.c	Sun Dec 31 19:57:29 2006 -0800
@@ -708,8 +708,8 @@
         g_free(str);
     }
 
-    if (bmp_playback_get_playing()) {
-	    cur_pb_time = bmp_playback_get_time();
+    if (playback_get_playing()) {
+	    cur_pb_time = playback_get_time();
     } else
 	    cur_pb_time = -1;
     cfg.resume_playback_on_startup_time = cur_pb_time;
@@ -1229,7 +1229,7 @@
 			while (gtk_events_pending()) gtk_main_iteration();
 			output_get_volume(&l, &r);
 			output_set_volume(0,0);
-			bmp_playback_initiate();
+			playback_initiate();
 
 			/* Busy wait; loop is fairly tight to minimize duration of "frozen" GUI. Feel free to 
 			 * tune. --chainsaw
@@ -1239,7 +1239,7 @@
 				if (!ip_data.playing)
 					break;
 			}
-			bmp_playback_seek(cfg.resume_playback_on_startup_time /
+			playback_seek(cfg.resume_playback_on_startup_time /
 					  1000);
 			output_set_volume(l, r);
 		}
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/mainwin.c
--- a/audacious/mainwin.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/mainwin.c	Sun Dec 31 19:57:29 2006 -0800
@@ -589,7 +589,7 @@
         widget_show(WIDGET(mainwin_seject));
 
         textbox_set_scroll(mainwin_info, FALSE);
-        if (bmp_playback_get_playing())
+        if (playback_get_playing())
 	{
             	widget_show(WIDGET(mainwin_sposition));
 	        widget_show(WIDGET(mainwin_stime_min));
@@ -1158,7 +1158,7 @@
     widget_show(WIDGET(mainwin_10sec_num));
     widget_show(WIDGET(mainwin_sec_num));
 
-    if (!bmp_playback_get_paused() && mainwin_playstatus != NULL)
+    if (!playback_get_paused() && mainwin_playstatus != NULL)
         playstatus_set_status(mainwin_playstatus, STATUS_PLAY);
 
     if (playlist_get_current_length(playlist) != -1) {
@@ -1406,12 +1406,12 @@
 		break;
 	case GDK_SCROLL_LEFT:
 		if (playlist_get_current_length(playlist) != -1)
-			bmp_playback_seek(CLAMP(bmp_playback_get_time() - 1000,
+			playback_seek(CLAMP(playback_get_time() - 1000,
 			    0, playlist_get_current_length(playlist)) / 1000);
 		break;
 	case GDK_SCROLL_RIGHT:
 		if (playlist_get_current_length(playlist) != -1)
-			bmp_playback_seek(CLAMP(bmp_playback_get_time() + 1000,
+			playback_seek(CLAMP(playback_get_time() + 1000,
 			    0, playlist_get_current_length(playlist)) / 1000);
 		break;
 	}
@@ -1590,16 +1590,16 @@
     case GDK_KP_Left:
     case GDK_KP_7:
         if (playlist_get_current_length(playlist) != -1)
-            bmp_playback_seek(CLAMP
-                              (bmp_playback_get_time() - 5000, 0,
+            playback_seek(CLAMP
+                              (playback_get_time() - 5000, 0,
                                playlist_get_current_length(playlist)) / 1000);
         break;
     case GDK_Right:
     case GDK_KP_Right:
     case GDK_KP_9:
         if (playlist_get_current_length(playlist) != -1)
-            bmp_playback_seek(CLAMP
-                              (bmp_playback_get_time() + 5000, 0,
+            playback_seek(CLAMP
+                              (playback_get_time() + 5000, 0,
                                playlist_get_current_length(playlist)) / 1000);
         break;
     case GDK_KP_4:
@@ -1644,7 +1644,7 @@
     if (playlist_get_current_length(playlist) > -1 &&
         time <= (playlist_get_current_length(playlist) / 1000))
     {
-        bmp_playback_seek(time);
+        playback_seek(time);
         gtk_widget_destroy(mainwin_jtt);
     }
 }
@@ -1658,7 +1658,7 @@
     guint tindex;
     gchar time_str[10];
 
-    if (!bmp_playback_get_playing()) {
+    if (!playback_get_playing()) {
         report_error("JIT can't be launched when no track is being played.\n");
         return;
     }
@@ -1730,7 +1730,7 @@
     g_signal_connect(jump, "clicked",
                      G_CALLBACK(mainwin_jump_to_time_cb), time_entry);
 
-    tindex = bmp_playback_get_time() / 1000;
+    tindex = playback_get_time() / 1000;
     g_snprintf(time_str, sizeof(time_str), "%u:%2.2u", tindex / 60,
                tindex % 60);
     gtk_entry_set_text(GTK_ENTRY(time_entry), time_str);
@@ -1746,11 +1746,11 @@
 static void
 change_song(guint pos)
 {
-    if (bmp_playback_get_playing())
-        bmp_playback_stop();
+    if (playback_get_playing())
+        playback_stop();
 
     playlist_set_position(playlist_get_active(), pos);
-    bmp_playback_initiate();
+    playback_initiate();
 }
 
 static void
@@ -2317,7 +2317,7 @@
 
     playlist_clear(playlist);
     playlist_add_url(playlist, (gchar *) selection_data->data);
-    bmp_playback_initiate();
+    playback_initiate();
 }
 
 static void
@@ -2340,7 +2340,7 @@
     {
         playlist_clear(playlist);
         playlist_add_url(playlist, text);
-        bmp_playback_initiate();
+        playback_initiate();
     }
 }
 
@@ -2457,14 +2457,14 @@
 mainwin_play_pushed(void)
 {
     if (ab_position_a != -1)
-        bmp_playback_seek(ab_position_a / 1000);
-    if (bmp_playback_get_paused()) {
-        bmp_playback_pause();
+        playback_seek(ab_position_a / 1000);
+    if (playback_get_paused()) {
+        playback_pause();
         return;
     }
 
     if (playlist_get_length(playlist_get_active()))
-        bmp_playback_initiate();
+        playback_initiate();
     else
         mainwin_eject_pushed();
 }
@@ -2474,7 +2474,7 @@
 {
     ip_data.stop = TRUE;
     mainwin_clear_song_info();
-    bmp_playback_stop();
+    playback_stop();
     ip_data.stop = FALSE;
 }
 
@@ -2547,7 +2547,7 @@
 void
 mainwin_spos_release_cb(gint pos)
 {
-    bmp_playback_seek(((playlist_get_current_length(playlist_get_active()) / 1000) *
+    playback_seek(((playlist_get_current_length(playlist_get_active()) / 1000) *
                        (pos - 1)) / 12);
 }
 
@@ -2574,7 +2574,7 @@
 
     length = playlist_get_current_length(playlist_get_active()) / 1000;
     time = (length * pos) / 219;
-    bmp_playback_seek(time);
+    playback_seek(time);
     mainwin_release_info_text();
 }
 
@@ -3096,7 +3096,7 @@
         mainwin_play_pushed();
         break;
     case MAINWIN_GENERAL_PAUSE:
-        bmp_playback_pause();
+        playback_pause();
         break;
     case MAINWIN_GENERAL_STOP:
         mainwin_stop_pushed();
@@ -3105,14 +3105,14 @@
         playlist_next(playlist);
         break;
     case MAINWIN_GENERAL_BACK5SEC:
-        if (bmp_playback_get_playing()
+        if (playback_get_playing()
             && playlist_get_current_length(playlist) != -1)
-            bmp_playback_seek_relative(-5);
+            playback_seek_relative(-5);
         break;
     case MAINWIN_GENERAL_FWD5SEC:
-        if (bmp_playback_get_playing()
+        if (playback_get_playing()
             && playlist_get_current_length(playlist) != -1)
-            bmp_playback_seek_relative(5);
+            playback_seek_relative(5);
         break;
     case MAINWIN_GENERAL_START:
         playlist_set_position(playlist, 0);
@@ -3129,16 +3129,16 @@
     case MAINWIN_GENERAL_SETAB:
         if (playlist_get_current_length(playlist) != -1) {
             if (ab_position_a == -1) {
-                ab_position_a = bmp_playback_get_time();
+                ab_position_a = playback_get_time();
                 ab_position_b = -1;
 		mainwin_lock_info_text("LOOP-POINT A POSITION SET.");
             } else if (ab_position_b == -1) {
-                int time = bmp_playback_get_time();
+                int time = playback_get_time();
                 if (time > ab_position_a)
                     ab_position_b = time;
 		mainwin_release_info_text();
             } else {
-                ab_position_a = bmp_playback_get_time();
+                ab_position_a = playback_get_time();
                 ab_position_b = -1;
 		mainwin_lock_info_text("LOOP-POINT A POSITION RESET.");
             }
@@ -3335,7 +3335,7 @@
     g_list_free(list);
 
     playlist_set_position(playlist, 0);
-    bmp_playback_initiate();
+    playback_initiate();
 }
 
 void
@@ -3581,7 +3581,7 @@
                        18, 23, 0, 23, 18, mainwin_play_pushed, SKIN_CBUTTONS);
     mainwin_pause =
         create_pbutton(&mainwin_wlist, mainwin_bg, mainwin_gc, 62, 88, 23,
-                       18, 46, 0, 46, 18, bmp_playback_pause, SKIN_CBUTTONS);
+                       18, 46, 0, 46, 18, playback_pause, SKIN_CBUTTONS);
     mainwin_stop =
         create_pbutton(&mainwin_wlist, mainwin_bg, mainwin_gc, 85, 88, 23,
                        18, 69, 0, 69, 18, mainwin_stop_pushed, SKIN_CBUTTONS);
@@ -3608,7 +3608,7 @@
                        7, mainwin_play_pushed);
     mainwin_spause =
         create_sbutton(&mainwin_wlist, mainwin_bg, mainwin_gc, 187, 4, 10,
-                       7, bmp_playback_pause);
+                       7, playback_pause);
     mainwin_sstop =
         create_sbutton(&mainwin_wlist, mainwin_bg, mainwin_gc, 197, 4, 9,
                        7, mainwin_stop_pushed);
@@ -3890,10 +3890,10 @@
     gchar stime_prefix;
 
     if (ab_position_a != -1 && ab_position_b != -1 && time > ab_position_b)
-        bmp_playback_seek(ab_position_a/1000);
+        playback_seek(ab_position_a/1000);
 
     length = playlist_get_current_length(playlist_get_active());
-    if (bmp_playback_get_playing())
+    if (playback_get_playing())
         playlistwin_set_time(time, length, cfg.timer_mode);
     else
         playlistwin_hide_timer();
@@ -3984,7 +3984,7 @@
 
     GDK_THREADS_ENTER();
 
-    if (bmp_playback_get_playing())
+    if (playback_get_playing())
         vis_playback_start();
     else {
         vis_playback_stop();
@@ -4051,10 +4051,10 @@
 
     /*
     if (seek_state == MAINWIN_SEEK_REV)
-        bmp_playback_seek(CLAMP(bmp_playback_get_time() - 1000, 0,
+        playback_seek(CLAMP(playback_get_time() - 1000, 0,
                                 playlist_get_current_length()) / 1000);
     else if (seek_state == MAINWIN_SEEK_FWD)
-        bmp_playback_seek(CLAMP(bmp_playback_get_time() + 1000, 0,
+        playback_seek(CLAMP(playback_get_time() + 1000, 0,
                                 playlist_get_current_length()) / 1000);
     */
 
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/output.c
--- a/audacious/output.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/output.c	Sun Dec 31 19:57:29 2006 -0800
@@ -89,7 +89,7 @@
 
     op_data.current_output_plugin = node->data;
 
-    playing = bmp_playback_get_playing();
+    playing = playback_get_playing();
 
     if (playing == TRUE)
     {
@@ -108,15 +108,15 @@
 	g_usleep(300000);
 
 	/* wait for the playback thread to come online */
-        while (bmp_playback_get_playing())
+        while (playback_get_playing())
             g_message("waiting for audio system shutdown...");
 
 	/* wait for the playback thread to come online */
         playlist_set_position(playlist_get_active(), pos);
 	entry = playlist_get_entry_to_play(playlist_get_active());
-        bmp_playback_play_file(entry);
+        playback_play_file(entry);
 
-	while (!bmp_playback_get_playing())
+	while (!playback_get_playing())
 	{
 	    gtk_main_iteration();
             g_message("waiting for audio system startup...");
@@ -128,7 +128,7 @@
 	{
 	    gint i;
 
-            bmp_playback_seek(time / 1000);
+            playback_seek(time / 1000);
         }
     }
 }
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/playback.c
--- a/audacious/playback.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/playback.c	Sun Dec 31 19:57:29 2006 -0800
@@ -54,7 +54,7 @@
 
 /* FIXME: yuck!! this shouldn't be here... */
 void
-bmp_playback_set_random_skin(void)
+playback_set_random_skin(void)
 {
     SkinNode *node;
     guint32 randval;
@@ -66,9 +66,9 @@
 }
 
 gint
-bmp_playback_get_time(void)
+playback_get_time(void)
 {
-    if (!bmp_playback_get_playing())
+    if (!playback_get_playing())
         return -1;
 
     if (!get_current_input_plugin())
@@ -78,7 +78,7 @@
 }
 
 void
-bmp_playback_initiate(void)
+playback_initiate(void)
 {
     PlaylistEntry *entry = NULL;
     Playlist *playlist = playlist_get_active();
@@ -87,8 +87,8 @@
     if (playlist_get_length(playlist) == 0)
         return;
 
-    if (bmp_playback_get_playing())
-        bmp_playback_stop();
+    if (playback_get_playing())
+        playback_stop();
 
     vis_clear_data(mainwin_vis);
     svis_clear_data(mainwin_svis);
@@ -105,7 +105,7 @@
      *
      *   - nenolod
      */
-    while (entry != NULL && !bmp_playback_play_file(entry))
+    while (entry != NULL && !playback_play_file(entry))
     {
         playlist_next(playlist);
 
@@ -128,7 +128,7 @@
 	    return;
     }
 
-    if (bmp_playback_get_time() != -1) {
+    if (playback_get_time() != -1) {
         equalizerwin_load_auto_preset(entry->filename);
         input_set_eq(cfg.equalizer_active, cfg.equalizer_preamp,
                      cfg.equalizer_bands);
@@ -141,9 +141,9 @@
 }
 
 void
-bmp_playback_pause(void)
+playback_pause(void)
 {
-    if (!bmp_playback_get_playing())
+    if (!playback_get_playing())
         return;
 
     if (!get_current_input_plugin())
@@ -163,13 +163,13 @@
 }
 
 void
-bmp_playback_stop(void)
+playback_stop(void)
 {
     if (ip_data.playing && get_current_input_plugin()) {
 
-        if (bmp_playback_get_paused()) {
+        if (playback_get_paused()) {
             output_flush(get_written_time()); /* to avoid noise */
-            bmp_playback_pause();
+            playback_pause();
         }
 
         ip_data.playing = FALSE; 
@@ -195,12 +195,12 @@
 }
 
 void
-bmp_playback_stop_reentrant(void)
+playback_stop_reentrant(void)
 {
     if (ip_data.playing && get_current_input_plugin()) {
 
-        if (bmp_playback_get_paused())
-            bmp_playback_pause();
+        if (playback_get_paused())
+            playback_pause();
 
         ip_data.playing = FALSE;
 
@@ -236,7 +236,7 @@
 }
 
 gboolean
-bmp_playback_play_file(PlaylistEntry *entry)
+playback_play_file(PlaylistEntry *entry)
 {
     g_return_val_if_fail(entry != NULL, FALSE);
 
@@ -247,7 +247,7 @@
     }
 
     if (cfg.random_skin_on_play)
-        bmp_playback_set_random_skin();
+        playback_set_random_skin();
 
     /*
      * This is slightly uglier than the original version, but should
@@ -276,19 +276,19 @@
 }
 
 gboolean
-bmp_playback_get_playing(void)
+playback_get_playing(void)
 {
     return ip_data.playing;
 }
 
 gboolean
-bmp_playback_get_paused(void)
+playback_get_paused(void)
 {
     return ip_data.paused;
 }
 
 void
-bmp_playback_seek(gint time)
+playback_seek(gint time)
 {
     gboolean restore_pause = FALSE;
     gint l=0, r=0;
@@ -308,7 +308,7 @@
 	restore_pause = TRUE;
 	output_get_volume(&l, &r);
 	output_set_volume(0,0);
-	bmp_playback_pause();	
+	playback_pause();	
     }
     
     free_vis_data();
@@ -316,15 +316,15 @@
     
     if(restore_pause)
     {
-	bmp_playback_pause();
+	playback_pause();
 	output_set_volume(l, r);
     }
 }
 
 void
-bmp_playback_seek_relative(gint offset)
+playback_seek_relative(gint offset)
 {
-    gint time = CLAMP(bmp_playback_get_time() / 1000 + offset,
+    gint time = CLAMP(playback_get_time() / 1000 + offset,
                       0, playlist_get_current_length(playlist_get_active()) / 1000 - 1);
-    bmp_playback_seek(time);
+    playback_seek(time);
 }
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/playback.h
--- a/audacious/playback.h	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/playback.h	Sun Dec 31 19:57:29 2006 -0800
@@ -22,16 +22,16 @@
 
 #include "audacious/playlist.h"
 
-void bmp_playback_set_random_skin(void);
-gint bmp_playback_get_time(void);
-void bmp_playback_initiate(void);
-void bmp_playback_pause(void);
-void bmp_playback_stop(void);
-void bmp_playback_stop_reentrant(void);
-gboolean bmp_playback_play_file(PlaylistEntry *entry);
-gboolean bmp_playback_get_playing(void);
-gboolean bmp_playback_get_paused(void);
-void bmp_playback_seek(gint time);
-void bmp_playback_seek_relative(gint offset);
+void playback_set_random_skin(void);
+gint playback_get_time(void);
+void playback_initiate(void);
+void playback_pause(void);
+void playback_stop(void);
+void playback_stop_reentrant(void);
+gboolean playback_play_file(PlaylistEntry *entry);
+gboolean playback_get_playing(void);
+gboolean playback_get_paused(void);
+void playback_seek(gint time);
+void playback_seek_relative(gint offset);
 
 #endif
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/playlist.c
--- a/audacious/playlist.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/playlist.c	Sun Dec 31 19:57:29 2006 -0800
@@ -1,4 +1,7 @@
-/*  BMP (C) GPL 2003 $top_src_dir/AUTHORS
+/*  Audacious
+ *  Copyright (C) 2005-2007  Audacious team.
+ *
+ *  BMP (C) GPL 2003 $top_src_dir/AUTHORS
  *
  *  based on:
  *
@@ -7,7 +10,6 @@
  *                           Thomas Nilsson and 4Front Technologies
  *  Copyright (C) 1999-2003  Haavard Kvaalen
  *
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; under version 2 of the License.
@@ -413,10 +415,10 @@
     if (playing_song == node) {
         *set_info_text = TRUE;
 
-        if (bmp_playback_get_playing()) {
+        if (playback_get_playing()) {
             PLAYLIST_UNLOCK(playlist->mutex);
             ip_data.stop = TRUE;
-            bmp_playback_stop();
+            playback_stop();
             ip_data.stop = FALSE;
             PLAYLIST_LOCK(playlist->mutex);
             *restart_playing = TRUE;
@@ -477,7 +479,7 @@
     playlistwin_update_list(playlist);
     if (restart_playing) {
         if (playlist->position) {
-            bmp_playback_initiate();
+            playback_initiate();
         }
         else {
             mainwin_clear_song_info();
@@ -519,7 +521,7 @@
 
     if (restart_playing) {
         if (playlist->position) {
-            bmp_playback_initiate();
+            playback_initiate();
         }
         else {
             mainwin_clear_song_info();
@@ -567,7 +569,7 @@
 
     if (restart_playing) {
         if (playlist->position) {
-            bmp_playback_initiate();
+            playback_initiate();
         }
         else {
             mainwin_clear_song_info();
@@ -1049,11 +1051,11 @@
         return;
     }
 
-    if (bmp_playback_get_playing()) {
+    if (playback_get_playing()) {
         /* We need to stop before changing playlist_position */
         PLAYLIST_UNLOCK(playlist->mutex);
         ip_data.stop = TRUE;
-        bmp_playback_stop();
+        playback_stop();
         ip_data.stop = FALSE;
         PLAYLIST_LOCK(playlist->mutex);
         restart_playing = TRUE;
@@ -1076,7 +1078,7 @@
     playlist_check_pos_current(playlist);
 
     if (restart_playing)
-        bmp_playback_initiate();
+        playback_initiate();
     else {
         mainwin_set_info_text();
         playlistwin_update_list(playlist);
@@ -1107,11 +1109,11 @@
         return;
     }
 
-    if (bmp_playback_get_playing()) {
+    if (playback_get_playing()) {
         /* We need to stop before changing playlist_position */
         PLAYLIST_UNLOCK(playlist->mutex);
         ip_data.stop = TRUE;
-        bmp_playback_stop();
+        playback_stop();
         ip_data.stop = FALSE;
         PLAYLIST_LOCK(playlist->mutex);
         restart_playing = TRUE;
@@ -1138,7 +1140,7 @@
     playlist_check_pos_current(playlist);
 
     if (restart_playing)
-        bmp_playback_initiate();
+        playback_initiate();
     else {
         mainwin_set_info_text();
         playlistwin_update_list(playlist);
@@ -1300,11 +1302,11 @@
         return;
     }
 
-    if (bmp_playback_get_playing()) {
+    if (playback_get_playing()) {
         /* We need to stop before changing playlist_position */
         PLAYLIST_UNLOCK(playlist->mutex);
         ip_data.stop = TRUE;
-        bmp_playback_stop();
+        playback_stop();
         ip_data.stop = FALSE;
         PLAYLIST_LOCK(playlist->mutex);
         restart_playing = TRUE;
@@ -1321,7 +1323,7 @@
     playlist_check_pos_current(playlist);
 
     if (restart_playing)
-        bmp_playback_initiate();
+        playback_initiate();
     else {
         mainwin_set_info_text();
         playlistwin_update_list(playlist);
@@ -1335,7 +1337,7 @@
 
     if ((cfg.no_playlist_advance && !cfg.repeat) || cfg.stopaftersong)
       ip_data.stop = TRUE;
-    bmp_playback_stop();
+    playback_stop();
     if ((cfg.no_playlist_advance && !cfg.repeat) || cfg.stopaftersong)  
       ip_data.stop = FALSE;
 
@@ -1353,7 +1355,7 @@
         PLAYLIST_UNLOCK(playlist->mutex);
         mainwin_clear_song_info();
         if (cfg.repeat)
-            bmp_playback_initiate();
+            playback_initiate();
         return;
     }
 
@@ -1388,7 +1390,7 @@
     PLAYLIST_UNLOCK(playlist->mutex);
 
     playlist_check_pos_current(playlist);
-    bmp_playback_initiate();
+    playback_initiate();
     mainwin_set_info_text();
     playlistwin_update_list(playlist);
 }
@@ -2534,7 +2536,7 @@
 
         if (entry == playlist->position) {
             /* Don't remove the currently playing song */
-            if (bmp_playback_get_playing())
+            if (playback_get_playing())
                 continue;
 
             if (next_node)
@@ -2662,7 +2664,7 @@
 
                 if (entry_cmp == playlist->position) {
                     /* Don't remove the currently playing song */
-                    if (bmp_playback_get_playing())
+                    if (playback_get_playing())
                         continue;
 
                     if (next_node_cmp)
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/pluginenum.c
--- a/audacious/pluginenum.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/pluginenum.c	Sun Dec 31 19:57:29 2006 -0800
@@ -381,9 +381,9 @@
 
     g_message("Shutting down plugin system");
 
-    if (bmp_playback_get_playing()) {
+    if (playback_get_playing()) {
         ip_data.stop = TRUE;
-        bmp_playback_stop();
+        playback_stop();
         ip_data.stop = FALSE;
     }
 
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/ui_playlist.c
--- a/audacious/ui_playlist.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/ui_playlist.c	Sun Dec 31 19:57:29 2006 -0800
@@ -1601,8 +1601,8 @@
         if (playlistwin_list->pl_prev_selected > -1
             && playlistwin_item_visible(playlistwin_list->pl_prev_selected)) {
             playlist_set_position(playlist, playlistwin_list->pl_prev_selected);
-            if (!bmp_playback_get_playing())
-                bmp_playback_initiate();
+            if (!playback_get_playing())
+                playback_initiate();
         }
         break;
     case GDK_3:
@@ -1625,16 +1625,16 @@
     case GDK_KP_Left:
     case GDK_KP_7:
         if (playlist_get_current_length(playlist) != -1)
-            bmp_playback_seek(CLAMP
-                              (bmp_playback_get_time() - 5000, 0,
+            playback_seek(CLAMP
+                              (playback_get_time() - 5000, 0,
                               playlist_get_current_length(playlist)) / 1000);
         break;
     case GDK_Right:
     case GDK_KP_Right:
     case GDK_KP_9:
         if (playlist_get_current_length(playlist) != -1)
-            bmp_playback_seek(CLAMP
-                              (bmp_playback_get_time() + 5000, 0,
+            playback_seek(CLAMP
+                              (playback_get_time() + 5000, 0,
                               playlist_get_current_length(playlist)) / 1000);
         break;
     case GDK_KP_4:
@@ -1903,7 +1903,7 @@
     playlistwin_spause =
         create_sbutton(&playlistwin_wlist, playlistwin_bg, playlistwin_gc,
                        playlistwin_get_width() - 128,
-                       cfg.playlist_height - 16, 10, 7, bmp_playback_pause);
+                       cfg.playlist_height - 16, 10, 7, playback_pause);
 
     /* stop button */
     playlistwin_sstop =
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/util.c
--- a/audacious/util.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/util.c	Sun Dec 31 19:57:29 2006 -0800
@@ -809,7 +809,7 @@
     g_slist_foreach(files, (GFunc) g_free, NULL);
     g_slist_free(files);
 
-    bmp_playback_initiate();
+    playback_initiate();
 }
 
 
@@ -1124,7 +1124,7 @@
     files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
     filebrowser_add_files_classic(files, GTK_FILE_SELECTION(filesel));
     gtk_widget_destroy(filesel);
-    bmp_playback_initiate();
+    playback_initiate();
 }
 
 static void filebrowser_add_selected_files_classic(GtkWidget * w, gpointer data)
diff -r 649e3418aac2 -r 894f7aa46f83 audacious/visualization.c
--- a/audacious/visualization.c	Sun Dec 31 11:40:27 2006 -0800
+++ b/audacious/visualization.c	Sun Dec 31 19:57:29 2006 -0800
@@ -124,12 +124,12 @@
         vp_data.enabled_list = g_list_append(vp_data.enabled_list, vp);
         if (vp->init)
             vp->init();
-        if (bmp_playback_get_playing() && vp->playback_start)
+        if (playback_get_playing() && vp->playback_start)
             vp->playback_start();
     }
     else if (!enable && g_list_find(vp_data.enabled_list, vp)) {
         vp_data.enabled_list = g_list_remove(vp_data.enabled_list, vp);
-        if (bmp_playback_get_playing() && vp->playback_stop)
+        if (playback_get_playing() && vp->playback_stop)
             vp->playback_stop();
         if (vp->cleanup)
             vp->cleanup();
@@ -183,7 +183,7 @@
                     g_list_append(vp_data.enabled_list, vp);
                 if (vp->init)
                     vp->init();
-                if (bmp_playback_get_playing() && vp->playback_start)
+                if (playback_get_playing() && vp->playback_start)
                     vp->playback_start();
             }
             g_free(base);