diff audacious/main.c @ 2228:894f7aa46f83 trunk

[svn] - bmp_playback_* -> playback_* -- i knew something smelled rotten here, hmm.
author nenolod
date Sun, 31 Dec 2006 19:57:29 -0800
parents 4de6e7d138c6
children ac2ea05e60a0
line wrap: on
line diff
--- 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);
 		}