changeset 2229:37076c4efff7 trunk

[svn] - bmp_playback_* -> playback_* -- i knew something smelled rotten in widgetcore, hmm.
author nenolod
date Sun, 31 Dec 2006 19:58:46 -0800
parents 894f7aa46f83
children 561dea8d84e1
files ChangeLog audacious/widgets/playlist_list.c audacious/widgets/svis.c audacious/widgets/vis.c
diffstat 4 files changed, 27 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Dec 31 19:57:29 2006 -0800
+++ b/ChangeLog	Sun Dec 31 19:58:46 2006 -0800
@@ -1,3 +1,23 @@
+2007-01-01 03:57:29 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3461]
+  - bmp_playback_* -> playback_* -- i knew something smelled rotten here, hmm.
+  
+  trunk/audacious/controlsocket.c |   26 ++++++-------
+  trunk/audacious/genevent.c      |    4 +-
+  trunk/audacious/input.c         |    6 +--
+  trunk/audacious/main.c          |    8 ++--
+  trunk/audacious/mainwin.c       |   78 ++++++++++++++++++++--------------------
+  trunk/audacious/output.c        |   10 ++---
+  trunk/audacious/playback.c      |   52 +++++++++++++-------------
+  trunk/audacious/playback.h      |   22 +++++------
+  trunk/audacious/playlist.c      |   44 +++++++++++-----------
+  trunk/audacious/pluginenum.c    |    4 +-
+  trunk/audacious/ui_playlist.c   |   14 +++----
+  trunk/audacious/util.c          |    4 +-
+  trunk/audacious/visualization.c |    6 +--
+  13 files changed, 140 insertions(+), 138 deletions(-)
+
+
 2006-12-31 19:40:27 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3459]
   - mark several tooltips in Preferences as translatable.
--- a/audacious/widgets/playlist_list.c	Sun Dec 31 19:57:29 2006 -0800
+++ b/audacious/widgets/playlist_list.c	Sun Dec 31 19:58:46 2006 -0800
@@ -359,13 +359,13 @@
             /*
              * Ungrab the pointer to prevent us from
              * hanging on to it during the sometimes slow
-             * bmp_playback_initiate().
+             * playback_initiate().
              */
             gdk_pointer_ungrab(GDK_CURRENT_TIME);
             gdk_flush();
             playlist_set_position(playlist, nr);
-            if (!bmp_playback_get_playing())
-                bmp_playback_initiate();
+            if (!playback_get_playing())
+                playback_initiate();
         }
 
         pl->pl_dragging = TRUE;
--- a/audacious/widgets/svis.c	Sun Dec 31 19:57:29 2006 -0800
+++ b/audacious/widgets/svis.c	Sun Dec 31 19:58:46 2006 -0800
@@ -119,7 +119,7 @@
 
     if (!cfg.doublesize) {
       memset(rgb_data, 0, SVIS_WIDTH * SVIS_HEIGHT);
-      if (cfg.vis_type == VIS_ANALYZER  && !bmp_playback_get_paused() && bmp_playback_get_playing()){
+      if (cfg.vis_type == VIS_ANALYZER  && !playback_get_paused() && playback_get_playing()){
 	for(y=0; y < SVIS_HEIGHT; y++){
 	  if (cfg.analyzer_type == ANALYZER_BARS){
 	    for(x=0;x< SVIS_WIDTH; x++){
@@ -188,7 +188,7 @@
     else {                      /* doublesize */
 
         memset(rgb_data, 0, SVIS_WIDTH * 2 * SVIS_HEIGHT * 2);
-        if (cfg.vis_type == VIS_ANALYZER && !bmp_playback_get_paused() && bmp_playback_get_playing()){
+        if (cfg.vis_type == VIS_ANALYZER && !playback_get_paused() && playback_get_playing()){
 	  for(y=0; y < SVIS_HEIGHT; y++){
             if (cfg.analyzer_type == ANALYZER_BARS){
               for(x=0;x< SVIS_WIDTH; x++){
--- a/audacious/widgets/vis.c	Sun Dec 31 19:57:29 2006 -0800
+++ b/audacious/widgets/vis.c	Sun Dec 31 19:58:46 2006 -0800
@@ -248,14 +248,14 @@
       }
     }
     else if (cfg.vis_type == VIS_VOICEPRINT) {
-      if(!bmp_playback_get_paused() && bmp_playback_get_playing()){/*Don't scroll when it's paused or stopped*/
+      if(!playback_get_paused() && playback_get_playing()){/*Don't scroll when it's paused or stopped*/
 	for (y = 0; y < 16; y ++)
 	  for (x = 75; x > 0; x--)
 	    voiceprint_data[x + y * 76] = voiceprint_data[x-1+y*76];
 	  for(y=0;y<16;y++)
 	    voiceprint_data[y * 76] = vis->vs_data[y];
       }
-      if(bmp_playback_get_playing()){ /*Only draw the data if we're playing*/
+      if(playback_get_playing()){ /*Only draw the data if we're playing*/
 	for (y = 0; y < 16; y ++){
 	  for (x = 0; x < 76; x++){
 	    guint8 d = voiceprint_data[x + y*76];