rpms/rhythmbox-equalizer/F-12 rhythmbox-equalizer-1.4-remember-last-used-preset.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rhythmbox-equalizer.spec, 1.1, 1.2 sources, 1.2, 1.3 rhythmbox-equalizer-1.3-fix-presets-per-user.patch, 1.1, NONE

Sun May 30 19:29:16 UTC 2010

Author: hicham

Update of /cvs/pkgs/rpms/rhythmbox-equalizer/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11743/F-12

Modified Files:
	.cvsignore import.log rhythmbox-equalizer.spec sources 
Added Files:
	rhythmbox-equalizer-1.4-remember-last-used-preset.patch 
Removed Files:
	rhythmbox-equalizer-1.3-fix-presets-per-user.patch 
Log Message:
New upstream release


rhythmbox-equalizer-1.4-remember-last-used-preset.patch:
 equalizer.py |   39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

--- NEW FILE rhythmbox-equalizer-1.4-remember-last-used-preset.patch ---
--- rhythmbox/plugins/rbeq/equalizer.py.old	2010-05-30 13:25:30.000000000 +0100
+++ rhythmbox/plugins/rbeq/equalizer.py	2010-05-30 19:40:39.000000000 +0100
@@ -24,18 +24,26 @@ import gst
 import pygtk
 import gtk
 import gconf
+import gobject
 
 gconf_str = "/apps/rhythmbox/plugins/rbeq/last_values"
+last_preset = "/apps/rhythmbox/plugins/rbeq/last_preset"
 
 class Equalizer:
-    presetListStore = gtk.ListStore(None)
+    presetListStore = gtk.ListStore(gobject.TYPE_STRING)
     sliders = []
+    combo = gtk.ComboBoxEntry()
     def __init__(self):
         self.equ = gst.element_factory_make("equalizer-10bands")
         self.conf_client = gconf.client_get_default()
         try:
+            preset= self.conf_client.get_string(last_preset)
+        except RuntimeError:
+            self.conf_client.set_string(last_preset, "")
+        try:
             level_str = self.conf_client.get_string(gconf_str)
             self.current_levels = list(float(i) for i in level_str.split(","))
+            self.update_preset_list()
         except AttributeError:
             lst = list(str(0) for i in range(0,10))
             values = ",".join(lst)
@@ -60,8 +68,10 @@ class Equalizer:
     def preset_changed(self, preset_combo):
         model = preset_combo.get_model()
         current_sel = preset_combo.get_active_iter()
-        selected = model.get_value(current_sel,0)
-        gst.Preset.load_preset(self.get_eq(), selected)
+        if current_sel != None :
+            selected = model.get_value(current_sel,0)
+            gst.Preset.load_preset(self.get_eq(), selected)
+            self.conf_client.set_string(last_preset, selected)
     
     def set_initial_levels(self):
         self.change_levels(self.get_current_levels())
@@ -87,6 +97,7 @@ class Equalizer:
     def add_preset(self, dialog, response,rb_context,entry):
         if response == gtk.RESPONSE_ACCEPT:
             gst.Preset.save_preset(self.get_eq(),entry.get_text())
+            self.conf_client.set_string(last_preset,entry.get_text())
             self.update_preset_list()
         dialog.destroy()
 
@@ -96,6 +107,7 @@ class Equalizer:
         val = model.get_value(sel, 0)
         gst.Preset.delete_preset(self.get_eq(), val)
         self.update_preset_list()
+        preset_combo.set_active(0)
 
     def confirm_save(self, calling_btn, rb_context, parent):
         save_dialog = gtk.Dialog("Save Preset", parent, 
@@ -115,9 +127,11 @@ class Equalizer:
     def update_preset_list(self):
         self.presetListStore.clear()
         names = self.read_presets()
-        for name in names:
+        for i,name in zip(range(len(names)),names):
             iter = self.presetListStore.append()
             self.presetListStore.set(iter,0,name)
+            if name == self.conf_client.get_string(last_preset) :
+                self.combo.set_active(i)
 
     def set_dialog(self,action, rb_context):
         builder = gtk.Builder()
@@ -132,24 +146,25 @@ class Equalizer:
                 self.sliders)
             self.sliders[i].set_value(lvl[i])
         self.presetListStore = builder.get_object("presetListStore")
-        self.update_preset_list()
 
-        combo = builder.get_object("presetCombo")
+        self.combo = builder.get_object("presetCombo")
         cell = gtk.CellRendererText()
         cell.set_fixed_height_from_font(1)
-        combo.pack_start(cell,False)
-        combo.add_attribute(cell, 'text',0)
-        combo.set_active(0)
+        self.combo.pack_start(cell,False)
+        self.combo.add_attribute(cell, 'text',0)
+        if self.conf_client.get_string(last_preset) == "" :
+            self.combo.set_active(0)
 
-        combo.connect("changed", self.preset_changed)
-        combo.connect("changed", self.update_sliders)
+        self.combo.connect("changed", self.preset_changed)
+        self.combo.connect("changed", self.update_sliders)
 
         # Set Preset Button actions
         del_preset_btn = builder.get_object("deletePresetBtn")
         del_preset_btn.connect("clicked", self.delete_preset, 
-            rb_context, combo)
+            rb_context, self.combo)
         save_preset_btn = builder.get_object("savePresetBtn")    
         save_preset_btn.connect("clicked", self.confirm_save, 
             rb_context, dialog)
+        self.update_preset_list()
         dialog.show() 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox-equalizer/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 May 2010 20:26:32 -0000	1.2
+++ .cvsignore	30 May 2010 19:29:15 -0000	1.3
@@ -1 +1 @@
-rbeq-1.3.tar.gz
+rbeq-1.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox-equalizer/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	4 May 2010 20:26:32 -0000	1.1
+++ import.log	30 May 2010 19:29:16 -0000	1.2
@@ -1 +1,2 @@
 rhythmbox-equalizer-1_3-2_fc13:F-12:rhythmbox-equalizer-1.3-2.fc13.src.rpm:1273004570
+rhythmbox-equalizer-1_4-1_fc13:F-12:rhythmbox-equalizer-1.4-1.fc13.src.rpm:1275247549


Index: rhythmbox-equalizer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox-equalizer/F-12/rhythmbox-equalizer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rhythmbox-equalizer.spec	4 May 2010 20:26:32 -0000	1.1
+++ rhythmbox-equalizer.spec	30 May 2010 19:29:16 -0000	1.2
@@ -2,8 +2,8 @@
 %define rb_plugins_dir %{_libdir}/rhythmbox/plugins
 
 Name:		rhythmbox-equalizer
-Version:	1.3
-Release:	2%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 Group:		Applications/Multimedia
 Summary:	An Equalizer plugin for Rhythmbox
 License:	GPLv2+
@@ -13,21 +13,23 @@ BuildRoot:	%(mktemp -ud %{_tmppath}/%{na
 
 Requires:	rhythmbox
 
-Patch0:		%{name}-%{version}-fix-presets-per-user.patch
+#Patch0: silence warning when starting rhythmbox with this plugin enabled, http://code.google.com/p/rbeq/issues/detail?id=9
+Patch0:		%{name}-%{version}-remember-last-used-preset.patch
+#Patch1: 
 
 %description
 10 Band Equalizer for Rhythmbox
 
 %prep
 %setup -q -n rhythmbox
-%patch0 -p1 -b .fix-presets-per-user
+%patch0 -p1 -b .remember-last-used-preset
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{rb_plugins_dir}/rbeq
-install -p -D -m 644 plugins/rbeq/*.py plugins/rbeq/rbeq.rb-plugin plugins/rbeq/rbeq_ui.xml plugins/rbeq/presets $RPM_BUILD_ROOT/%{rb_plugins_dir}/rbeq
+install -p -D -m 644 plugins/rbeq/*.py plugins/rbeq/rbeq.rb-plugin plugins/rbeq/rbeq_ui.xml $RPM_BUILD_ROOT/%{rb_plugins_dir}/rbeq
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +40,10 @@ rm -rf $RPM_BUILD_ROOT
 %{rb_plugins_dir}/rbeq
 
 %changelog
+* Sun May 30 2010 Hicham HAOUARI <hicham.haouari at gmail.com> 1.4-1
+- New upstream release
+- Drop the presets per user patch ( gstreamer presets are now used instead )
+
 * Mon Apr 15 2010 Hicham HAOUARI <hicham.haouari at gmail.com> 1.3-2
 - Added patch to fix the presets saving issue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox-equalizer/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 May 2010 20:26:32 -0000	1.2
+++ sources	30 May 2010 19:29:16 -0000	1.3
@@ -1 +1 @@
-eab2aa29df03b565351b4f1aba60e71f  rbeq-1.3.tar.gz
+8ccee1ede2744cfccaebdf1764039439  rbeq-1.4.tar.gz


--- rhythmbox-equalizer-1.3-fix-presets-per-user.patch DELETED ---

