sound-juicer r2151 - in trunk: . data po src

[rburton svn gnome org]

Author: rburton
Date: Sun Apr 13 16:56:05 2008
New Revision: 2151
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2151&view=rev

Log:
2008-04-13  Ross Burton  <ross burtonini com>

	* configure.in:
	Bump GTK+ dependency to 2.12.

	* src/Makefile.am:
	* src/bacon-volume.[ch]:
	* po/POTFILES.in:
	Remove BaconVolume widget.

	* data/sound-juicer.glade:
	* src/sj-main.c:
	* src/sj-play.[ch]:
	Use GtkVolumeButton (#518753, thanks Michael Terry)


Removed:
   trunk/src/bacon-volume.c
   trunk/src/bacon-volume.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/data/sound-juicer.glade
   trunk/po/POTFILES.in
   trunk/src/Makefile.am
   trunk/src/sj-main.c
   trunk/src/sj-play.c
   trunk/src/sj-play.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Apr 13 16:56:05 2008
@@ -51,7 +51,7 @@
 LIBS="$oldlibs"
 
 # Find the UI libraries
-PKG_CHECK_MODULES(UI, gtk+-2.0 >= 2.8  libglade-2.0  gconf-2.0  libgnomeui-2.0 >= 2.13.0  gnome-vfs-2.0 >= 2.9 gnome-vfs-module-2.0 > 2.9 gmodule-export-2.0 dbus-glib-1)
+PKG_CHECK_MODULES(UI, gtk+-2.0 >= 2.12  libglade-2.0  gconf-2.0  libgnomeui-2.0 >= 2.13.0  gnome-vfs-2.0 >= 2.9 gnome-vfs-module-2.0 > 2.9 gmodule-export-2.0 dbus-glib-1)
 AC_SUBST(UI_CFLAGS)
 AC_SUBST(UI_LIBS)
 

Modified: trunk/data/sound-juicer.glade
==============================================================================
--- trunk/data/sound-juicer.glade	(original)
+++ trunk/data/sound-juicer.glade	Sun Apr 13 16:56:05 2008
@@ -542,7 +542,7 @@
                 <child>
                   <widget class="Custom" id="volume_button">
                     <property name="visible">True</property>
-                    <property name="creation_function">sj_make_volume_button</property>
+                    <property name="creation_function">gtk_volume_button_new</property>
                     <signal name="value_changed" handler="on_volume_changed"/>
                   </widget>
                   <packing>

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sun Apr 13 16:56:05 2008
@@ -11,7 +11,6 @@
 libjuicer/sj-metadata-musicbrainz.c
 libjuicer/sj-structures.c
 libjuicer/sj-util.c
-src/bacon-volume.c
 src/gconf-bridge.c
 src/sj-about.c
 src/sj-extracting.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Apr 13 16:56:05 2008
@@ -21,8 +21,6 @@
 	gedit-message-area.c \
 	gconf-bridge.h \
 	gconf-bridge.c \
-	bacon-volume.c \
-	bacon-volume.h \
 	$(BACON_FILES)
 
 sound_juicer_CPPFLAGS = \

Modified: trunk/src/sj-main.c
==============================================================================
--- trunk/src/sj-main.c	(original)
+++ trunk/src/sj-main.c	Sun Apr 13 16:56:05 2008
@@ -54,7 +54,6 @@
 #include "sj-play.h"
 #include "sj-genres.h"
 #include "gedit-message-area.h"
-#include "bacon-volume.h"
 
 gboolean on_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data);
 
@@ -791,9 +790,9 @@
   
   GtkWidget *volb = glade_xml_get_widget (glade, "volume_button");
   if (entry->value == NULL) {
-    bacon_volume_button_set_value (BACON_VOLUME_BUTTON (volb), 1.0);
+    gtk_scale_button_set_value (GTK_SCALE_BUTTON (volb), 1.0);
   } else {
-    bacon_volume_button_set_value (BACON_VOLUME_BUTTON (volb), gconf_value_get_float (entry->value));
+    gtk_scale_button_set_value (GTK_SCALE_BUTTON (volb), gconf_value_get_float (entry->value));
   }
 }
 
@@ -1468,15 +1467,6 @@
   }
 }
 
-GtkWidget *
-sj_make_volume_button (void)
-{
-  GtkWidget *w = bacon_volume_button_new (GTK_ICON_SIZE_SMALL_TOOLBAR,
-                                          0.0, 1.0, 0.02);
-  bacon_volume_button_set_value (BACON_VOLUME_BUTTON (w), 1.0);
-  return w;
-}
-
 static void
 upgrade_gconf (void)
 {

Modified: trunk/src/sj-play.c
==============================================================================
--- trunk/src/sj-play.c	(original)
+++ trunk/src/sj-play.c	Sun Apr 13 16:56:05 2008
@@ -33,7 +33,6 @@
 #include <gtk/gtkstatusbar.h>
 #include <gtk/gtkmessagedialog.h>
 
-#include "bacon-volume.h"
 #include "sound-juicer.h"
 #include "sj-play.h"
 
@@ -585,9 +584,9 @@
  */
 
 void
-on_volume_changed (GtkWidget * volb, gpointer data)
+on_volume_changed (GtkWidget * volb, gdouble value, gpointer data)
 {
-  vol = bacon_volume_button_get_value (BACON_VOLUME_BUTTON (volb));
+  vol = value;
   if (pipeline) {
     GstElement *volume;
 

Modified: trunk/src/sj-play.h
==============================================================================
--- trunk/src/sj-play.h	(original)
+++ trunk/src/sj-play.h	Sun Apr 13 16:56:05 2008
@@ -45,7 +45,7 @@
 void on_tracklist_row_selected (GtkTreeView *treeview,
 		                gpointer user_data);
 
-void on_volume_changed (GtkWidget* volb, gpointer data);
+void on_volume_changed (GtkWidget* volb, gdouble value, gpointer data);
 
 gboolean on_seek_press (GtkWidget * scale, 
 			GdkEventButton * event,