Merge lp:~victored/beat-box/equalizer-fixes into lp:beat-box

[Victor Martinez]

Some extra improvements to the equalizer:

* Make the switch insensitive while adding a new preset
* Validate the text in new-preset-entry and NewPresetWindow
* Don't let new-preset-entry lose keyboard focus
* NewPresetWindow is now transient for EqualizerWindow instead of LibraryWindow.
* Set the last preset in the ComboBox if NewPresetWindow is closed not using 'DONE'.
* Settings: make getSelectedPreset() and setSelectedPreset() handle only the name of the current preset.
* Corrected values for "Full Treble". This was causing an improper behavior.
* Make the new-preset-entry match the size of the ComboBox
* Code cleanup
* Error validation (avoid some potential segfaults)
* Apply the automatic preset correctly
* Ensure the proper saving of custom presets
  - They're saved and applied even if the window is closed during the process.
* Minor code fixes
* Remove the close button from the equalizer-window (as long as the window manager supports it). Currently, this works only under GNOME-Shell and Unity-2D.

The code is mature enough for merging into trunk.

[Sergey "Shnatsel" Davidoff (shnatsel)]

Wow, this is impressive!

[Victor Martinez (victored)]

Thanks Sergey!

[Scott Ringwelski (sgringwe)]

I am merging the changes, however:

1. In lm.change_gains_thread, errors are thrown when no song is playing (i.e. song_info.song == null).
2. ... that's it!

So, what i'm going to do is merge and then I will add a simple check for that myself, since it's easier that way.

Great work again!

review: Approve

[Victor Martinez (victored)]

My bad! Thanks a lot for fixing that error!

BTW, the on_close() function on EqualizerWindows is potentially dangerous. Maybe some sleep time should be added whenever the scales are in transition in order to avoid the failed-assertion messages. There are no other errors [I'm aware of] aside from that.

=== modified file 'schemas/org.gnome.beatbox.gschema.xml'
--- schemas/org.gnome.beatbox.gschema.xml	2011-11-22 03:08:33 +0000
+++ schemas/org.gnome.beatbox.gschema.xml	2011-12-05 01:21:23 +0000
@@ -107,18 +107,18 @@
     </key>
     <key type="s" name="selected-preset">
       <default>''</default>
-      <summary>Contains information regarding the user-selected preset</summary>
+      <summary>Contains the name of the user-selected preset</summary>
       <description>Contains information regarding the user-selected preset</description>
     </key>
     <key type="s" name="custom-presets">
       <default>''</default>
       <summary>Custom Equalizer Presets</summary>
-      <description>Contains the list of presets added by the user</description>
+      <description>Contains the list of presets added by the user. Gain values are between -80 and 80</description>
     </key>
     <key type="s" name="default-presets">
-      <default>'Flat,0,0,0,0,0,0,0,0,0,0/Classical,0,0,0,0,0,0,-40,-40,-40,-50/Club,0,0,20,30,30,30,20,0,0,0/Dance,50,35,10,0,0,-30,-40,-40,0,0/Full Bass,70,70,70,40,20,-45,-50,-55,-55,-55/Full Treble,-50,-50,-50,-25,15,55,80,80,80,85/Full Bass + Treble,35,30,0,-40,-25,10,45,55,60,60/Laptop/Headphones,25,50,25,-20,0,-30,-40,-40,0,0/Large Hall,50,50,30,30,0,-25,-25,-25,0,0/Live,-25,0,20,25,30,30,20,15,15,10/Party,35,35,0,0,0,0,0,0,35,35/Pop,-10,25,35,40,25,-5,-15,-15,-10,-10/Reggae,0,0,-5,-30,0,-35,-35,0,0,0/Rock,40,25,-30,-40,-20,20,45,55,55,55/Soft,25,10,-5,-15,-5,20,45,50,55,60/Ska,-15,-25,-25,-5,20,30,45,50,55,50/Soft Rock,20,20,10,-5,-25,-30,-20,-5,15,45/Techno,40,30,0,-30,-25,0,40,50,50,45/'</default>
+      <default>'Flat,0,0,0,0,0,0,0,0,0,0/Classical,0,0,0,0,0,0,-40,-40,-40,-50/Club,0,0,20,30,30,30,20,0,0,0/Dance,50,35,10,0,0,-30,-40,-40,0,0/Full Bass,70,70,70,40,20,-45,-50,-55,-55,-55/Full Treble,-50,-50,-50,-25,15,55,80,80,80,80/Full Bass + Treble,35,30,0,-40,-25,10,45,55,60,60/Laptop/Headphones,25,50,25,-20,0,-30,-40,-40,0,0/Large Hall,50,50,30,30,0,-25,-25,-25,0,0/Live,-25,0,20,25,30,30,20,15,15,10/Party,35,35,0,0,0,0,0,0,35,35/Pop,-10,25,35,40,25,-5,-15,-15,-10,-10/Reggae,0,0,-5,-30,0,-35,-35,0,0,0/Rock,40,25,-30,-40,-20,20,45,55,55,55/Soft,25,10,-5,-15,-5,20,45,50,55,60/Ska,-15,-25,-25,-5,20,30,45,50,55,50/Soft Rock,20,20,10,-5,-25,-30,-20,-5,15,45/Techno,40,30,0,-30,-25,0,40,50,50,45/'</default>
       <summary>Default Equalizer Presets</summary>
-      <description>Contains the list of default presets</description>
+      <description>Contains the list of default presets. Gain values are between -80 and 80</description>
     </key>
     <key type="b" name="auto-switch-preset">
       <default>true</default>

=== modified file 'src/Dialogs/EqualizerWindow.vala'
--- src/Dialogs/EqualizerWindow.vala	2011-12-01 04:39:30 +0000
+++ src/Dialogs/EqualizerWindow.vala	2011-12-05 01:21:23 +0000
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 2011	   Scott Ringwelski <[e-mail]>
  *
- * Originally Written by Scott Ringwelski and Victor Eduardo for BeatBox Music Player
+ * Originally Written by Scott Ringwelski and Victor Eduardo for
  * BeatBox Music Player: http://www.launchpad.net/beat-box
  *
  * This library is free software; you can redistribute it and/or
@@ -37,8 +37,7 @@
 	bool initialized;
 	bool automatic_chosen;
 	bool adding_preset;
-
-	private string new_preset_name;
+	bool closing;
 
 	List<VScale> scale_list;
 	List<Label> label_list;
@@ -46,6 +45,8 @@
 	bool in_transition;
 	Gee.ArrayList<int> target_levels;
 	
+	private string new_preset_name;
+	
 	public EqualizerWindow (LibraryManager lm, LibraryWindow lw) {
 	
 		this.lm = lm;
@@ -53,9 +54,10 @@
 		
 		scale_list = new List<VScale>();
 		label_list = new List<Label>();
+		target_levels = new Gee.ArrayList<int>();
+		closing = false;
 		adding_preset = false;
 		initialized = false;
-		target_levels = new Gee.ArrayList<int>();
 		automatic_chosen = false;
 
 		build_ui();
@@ -70,12 +72,10 @@
 		eq_switch.set_active(lm.settings.getEqualizerEnabled());
 		on_eq_switch_toggled();
 
-		if (lm.settings.getAutoSwitchPreset()) {
-			preset_combo.selectAutomaticPreset();
-			on_automatic_chosen();
-		}
-
 		initialized = true;
+
+		if (lm.settings.getAutoSwitchPreset())
+			preset_combo.selectAutomaticPreset();
 	}
 	
 	void build_ui () {
@@ -85,17 +85,17 @@
 		window_position = WindowPosition.CENTER;
 		type_hint = Gdk.WindowTypeHint.DIALOG;
 		set_transient_for(lw);
-		
 		set_size_request(440, 224);
 		resizable = false;
+		set_deletable(false);
 
 		set_icon(render_icon(Gtk.Stock.PREFERENCES, IconSize.DIALOG, null));
 		
 		var outer_box = new HBox(false, 10);
 		var inner_box = new VBox(false, 0);
 		var scales = new HBox(false, 0);
-		bottom_toolbar = new Toolbar();		
 		
+		bottom_toolbar = new Toolbar();
 		eq_switch = new Switch();
 		preset_combo = new PresetList(lm, lw);
 		
@@ -132,7 +132,7 @@
 
 		}
 
-		preset_combo.set_size_request(150, -1);
+		preset_combo.set_size_request(170, -1);
 
 		var eq_switch_item = new ToolItem();
 		eq_switch_item.add(eq_switch);
@@ -141,7 +141,7 @@
 		side_list.add(preset_combo);
 
 		new_preset_entry = new Entry();
-		new_preset_entry.set_size_request(150, -1);
+		new_preset_entry.set_size_request(170, -1);
 		new_preset_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.Stock.OK);
 		new_preset_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, "Save this preset");
 
@@ -150,10 +150,11 @@
 
 		var space_item = new ToolItem();
 		space_item.set_expand(true);
-		
+
 		var close_button = new Button.with_label("Close");
 		var close_button_item = new ToolItem();
-		close_button_item.set_expand(true);
+		close_button.set_size_request(120, -1);
+		close_button_item.set_expand(false);
 		close_button_item.add(close_button);
 
 		bottom_toolbar.insert(eq_switch_item, 0);
@@ -172,18 +173,25 @@
 		
 		eq_switch.notify["active"].connect(on_eq_switch_toggled);
 		preset_combo.automatic_preset_chosen.connect(on_automatic_chosen);
-		preset_combo.add_preset_chosen.connect(addPresetClicked);
-		preset_combo.delete_preset_chosen.connect(removePresetClicked);
-		preset_combo.preset_selected.connect(presetSelected);
+		preset_combo.add_preset_chosen.connect(add_preset_clicked);
+		preset_combo.delete_preset_chosen.connect(remove_preset_clicked);
+		preset_combo.preset_selected.connect (preset_selected);
 		new_preset_entry.activate.connect (add_new_preset);
 		new_preset_entry.icon_press.connect (new_preset_entry_icon_pressed);
+		new_preset_entry.focus_out_event.connect (on_entry_focus_out);
 
-		close_button.clicked.connect(on_close);
-		destroy.connect(on_close);
+		close_button.clicked.connect(on_close_button_clicked);
+		destroy.connect(on_quit);
 		
 		show_all();
 	}
 	
+	bool on_entry_focus_out () {
+		if(!closing)
+			new_preset_entry.grab_focus();
+		return true;
+	}
+	
 	static Gtk.Alignment wrap_alignment (Gtk.Widget widget, int top, int right, int bottom, int left) {
 	
 		var alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f);
@@ -246,11 +254,12 @@
 		foreach (EqualizerPreset preset in custom_presets) {
 			preset_combo.addPreset(preset);
 		}
+		
+		preset_combo.default_presets_changed = false;
 	}
 
-	void presetSelected(EqualizerPreset p) {
+	void preset_selected (EqualizerPreset p) {
 		automatic_chosen = false;
-
 		set_sliders_sensitivity (true);
 		target_levels.clear();
 		
@@ -258,17 +267,21 @@
 			target_levels.add(i);
 		}
 		
-		if (!initialized) {
+		set_target_levels ();
+		
+		if (!in_transition && !closing) {
+			in_transition = true;
+			Timeout.add(20, transition_scales);
+		}
+	}
+	
+	void set_target_levels () {
+		if (!initialized || closing) {
 			for (int index = 0; index < 10; ++index) {
 				scale_list.nth_data(index).set_value(target_levels.get(index));
 			}
 			return;
 		}
-		
-		if (!in_transition) {
-			in_transition = true;
-			Timeout.add(20, transition_scales);
-		}
 	}
 	
 	bool transition_scales () {
@@ -280,7 +293,7 @@
 			double targetLvl = target_levels.get(index);
 			double difference = targetLvl - currLvl;
 			
-			if (Math.fabs(difference) <= 1)
+			if (closing || Math.fabs(difference) <= 1)
 				scale_list.nth_data(index).set_value(targetLvl);
 			else {
 				scale_list.nth_data(index).set_value(scale_list.nth_data(index).get_value() + (difference / 8.0));
@@ -311,39 +324,19 @@
 
 		adding_preset = true;
 
-		bool preset_already_exists = false;
-		var current_presets = preset_combo.getPresets();
-
 		bottom_toolbar.remove(side_list);
 		bottom_toolbar.insert(new_preset_field, 1);
 
-		string current_preset_name = preset_combo.getSelectedPreset().name;
-		string new_preset_name = " ";
-		int i = 1;
-
-		do
-		{
-			new_preset_name = current_preset_name + " (Custom" + ((preset_already_exists)? " " + i.to_string() : "") + ")";
-
-			preset_already_exists = false;
-
-			foreach(EqualizerPreset preset in current_presets) {
-				if(new_preset_name == preset.name) {
-					preset_already_exists = true;
-					break;
-				}
-			}
-
-			i++;
-		
-		} while (preset_already_exists);
+		new_preset_name = create_new_preset_name(true);
 
 		new_preset_entry.set_text(new_preset_name);
+		eq_switch.sensitive = false;
 		bottom_toolbar.show_all();
 		new_preset_entry.grab_focus();
 	}
 
 	void new_preset_entry_icon_pressed (EntryIconPosition pos, Gdk.Event event) {
+
 		if(pos != Gtk.EntryIconPosition.SECONDARY && !adding_preset)
 			return;
 
@@ -351,12 +344,13 @@
 	}
 
 	void add_new_preset() {
+
 		if(!adding_preset)
 			return;
 
 		var new_name = new_preset_entry.get_text();
 
-		if(new_name != null)
+		if(verify_preset_name(new_name))
 			new_preset_name = new_name;
 
 		int i = 0;
@@ -373,31 +367,118 @@
 		bottom_toolbar.remove(new_preset_field);
 		bottom_toolbar.insert(side_list, 1);
 		bottom_toolbar.show_all();
-		
+		eq_switch.sensitive = true;
 		adding_preset = false;
 	}
 
-	void addPresetClicked () {
-		PresetNameWindow pnw = new PresetNameWindow(lw, new EqualizerPreset.basic("Custom Preset"));
-		pnw.preset_saved.connect(presetNameWindowSaved);
-	}
-	
-	void presetNameWindowSaved (EqualizerPreset p) {
+	string create_new_preset_name (bool from_current) {
+
+		int i = 0;
+		bool is_valid = false;
+		
+		string current_preset_name = (from_current)? preset_combo.getSelectedPreset().name : "";
+		string preset_name = "Custom Preset";
+
+		do
+		{
+			preset_name = (from_current)? current_preset_name + " (" : "";
+			preset_name += "Custom" + ((from_current)? "" : " Preset"); 
+			preset_name += ((!is_valid && i > 0)? " " + i.to_string() : "");
+			preset_name += (from_current)? ")" : "";
+
+			i++;
+
+			is_valid = verify_preset_name(preset_name);
+		} while (!is_valid);
+
+		return preset_name;
+	}
+
+	public bool verify_preset_name(string name) {
+	
+		/* This function verifies the name of a new preset.
+		   It will return 'true' whenever:
+		    - The name is not null
+		    - The name doesn't consist [enterely] of white space.
+		    - The name is not already in the list.
+		*/
+
+		int white_space = 0;
+		int str_length = name.length;
+		bool preset_already_exists = false;
+
+		if(str_length < 1)
+			return false;
+
+		for(int i = 0; i < str_length; ++i) {
+			if(name[i] == ' ' || name[i] == '\t')
+				white_space++;
+		}
+
+		if(white_space == str_length)
+			return false;
+
+		var current_presets = preset_combo.getPresets();
+
+		preset_already_exists = false;
+
+		foreach(EqualizerPreset preset in current_presets) {
+			if(name == preset.name) {
+				preset_already_exists = true;
+				break;
+			}
+		}
+		
+		return !preset_already_exists;
+	}
+
+	void add_preset_clicked () {
+		string name = create_new_preset_name(false);
+		PresetNameWindow pnw = new PresetNameWindow(this, new EqualizerPreset.basic(name));
+		pnw.preset_saved.connect(preset_name_window_saved);
+		pnw.action_canceled.connect(select_last_used_preset);
+	}
+	
+	void select_last_used_preset () {
+		var last_preset = preset_combo.last_selected_preset;
+		
+		if(!automatic_chosen && last_preset != null)
+			preset_combo.selectPreset(last_preset.name);
+		else
+			preset_combo.selectAutomaticPreset();
+	}
+	
+	void preset_name_window_saved (EqualizerPreset p) {
 		preset_combo.addPreset(p);
 	}
 
-	void removePresetClicked () {
-
-		preset_combo.removeCurrentPreset();
+	void remove_preset_clicked () {
+		if(!automatic_chosen)
+			preset_combo.removeCurrentPreset();
 	}
 
-	void on_close () {
+	void on_close_button_clicked () {
+		closing = true;
+
+		if(adding_preset)
+			add_new_preset();
+
 		if(!in_transition)
 			close_equalizer();
 		else
 			Timeout.add(20, close_equalizer);
 	}
-	
+
+	void on_quit () {
+
+		if(!in_transition)
+			on_close_button_clicked();
+		else {
+			set_target_levels ();
+			close_equalizer ();
+		}
+	}
+
 	bool close_equalizer () {
 
 		if(in_transition)
@@ -405,27 +486,29 @@
 
 		lm.settings.setEqualizerEnabled(eq_switch.get_active());
 		
-		if(preset_combo.getSelectedPreset() != null) {
+		if(preset_combo.getSelectedPreset() != null)
 			lm.settings.setSelectedPreset(preset_combo.getSelectedPreset());
-		}
 
 		var defaultPresets = new Gee.LinkedList<EqualizerPreset>();
 		var customPresets = new Gee.LinkedList<EqualizerPreset>();
 
-		foreach(EqualizerPreset preset in preset_combo.getPresets()) {
-			if(preset.is_default == true)
-				defaultPresets.add(preset);
+		foreach (EqualizerPreset preset in preset_combo.getPresets()) {
+			if (preset.is_default == true)
+				defaultPresets.add (preset);
 			else
-				customPresets.add(preset);
+				customPresets.add (preset);
 		}
 
-		lm.settings.setPresets(defaultPresets, null);
-		lm.settings.setPresets(customPresets, "custom-presets");
-
-		lm.settings.setAutoSwitchPreset(automatic_chosen);
+		if(preset_combo.default_presets_changed)		
+			lm.settings.setPresets (defaultPresets, null);
+
+		lm.settings.setPresets (customPresets, lm.settings.CUSTOM_PRESETS);
+
+		lm.settings.setAutoSwitchPreset (automatic_chosen);
 
 		destroy();
 		
 		return false;
 	}
 }
+

=== modified file 'src/Dialogs/PresetNameWindow.vala'
--- src/Dialogs/PresetNameWindow.vala	2011-11-30 22:17:03 +0000
+++ src/Dialogs/PresetNameWindow.vala	2011-12-05 01:21:23 +0000
@@ -20,14 +20,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/* Merely a place holder for multiple pieces of information regarding
- * the current song playing. Mostly here because of dependence. */
-
 using Gtk;
 
 public class BeatBox.PresetNameWindow : Window {
 	public EqualizerPreset _original;
 	
+	EqualizerWindow ew;
 	VBox content;
 	HBox padding;
 	
@@ -35,14 +33,17 @@
 	public Button _save;
 	
 	public signal void preset_saved(EqualizerPreset p);
+	public signal void action_canceled();
 
-	public PresetNameWindow(LibraryWindow lw, EqualizerPreset original) {
+	public PresetNameWindow(EqualizerWindow ew, EqualizerPreset original) {
 		title = "";
 		
+		this.ew = ew;
+		
 		this.window_position = WindowPosition.CENTER;
 		this.type_hint = Gdk.WindowTypeHint.DIALOG;
 		this.set_modal(true);
-		this.set_transient_for(lw);
+		this.set_transient_for(ew);
 		this.destroy_with_parent = true;
 		resizable = false;
 		set_size_request(200, -1);		
@@ -80,6 +81,7 @@
 		
 		_save.clicked.connect(saveClicked);
 		_name.activate.connect(nameActivate);
+		this.destroy.connect(on_action_canceled);
 	}
 	
 	public static Gtk.Alignment wrap_alignment (Gtk.Widget widget, int top, int right, int bottom, int left) {
@@ -94,7 +96,9 @@
 	}
 	
 	public virtual void saveClicked() {
-		_original.name = _name.text;
+		if(ew.verify_preset_name(_name.text))
+			_original.name = _name.text;
+
 		preset_saved(_original);
 		
 		this.destroy();
@@ -103,4 +107,9 @@
 	public virtual void nameActivate() {
 		saveClicked();
 	}
+	
+	public virtual void on_action_canceled() {
+		action_canceled();
+		this.destroy();
+	}
 }

=== modified file 'src/LibraryManager.vala'
--- src/LibraryManager.vala	2011-12-03 21:19:37 +0000
+++ src/LibraryManager.vala	2011-12-05 01:21:23 +0000
@@ -222,11 +222,7 @@
 		
 		// set the equalizer
 		if(settings.getEqualizerEnabled() && !settings.getAutoSwitchPreset()) {
-				EqualizerPreset p = settings.getSelectedPreset();
-				if(p != null) {
-					for(int i = 0; i < 10; ++i)
-						player.setEqualizerGain(i, p.getGain(i));
-				}
+			set_selected_equalizer_preset ();
 		}
 		
 		dm = new DeviceManager(this);
@@ -1291,13 +1287,7 @@
 			}
 			
 			if(!matched_genre) {
-				var p = settings.getSelectedPreset();
-				
-				if(p == null)
-					return null;
-				
-				for(int i = 0; i < 10; ++i)
-					player.setEqualizerGain(i, p.getGain(i));
+				set_selected_equalizer_preset ();
 			}
 		}
 		
@@ -1495,6 +1485,19 @@
 		progress_cancel_clicked();
 	}
 	
+	public void set_selected_equalizer_preset () {
+		string selected_preset = settings.getSelectedPreset();
+		if(selected_preset != null) {
+			foreach (EqualizerPreset p in settings.getPresets(null)) {
+				if(p.name == selected_preset) {
+					for(int i = 0; i < 10; ++i)
+						player.setEqualizerGain(i, p.getGain(i));
+					break;
+				}
+			}
+		}
+	}
+
 	public Gdk.Pixbuf? get_album_art(int id) {
 		Song s = _songs.get(id);
 		

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2011-11-22 03:08:33 +0000
+++ src/Settings.vala	2011-12-05 01:21:23 +0000
@@ -306,18 +306,12 @@
 		return getBool(EQUALIZER_ENABLED, false);
 	}
 	
-	public EqualizerPreset? getSelectedPreset() {
-		string[] vals = getString(SELECTED_PRESET, "").split(",", 0);
+	public string? getSelectedPreset() {
+		string rv = getString(SELECTED_PRESET, "");
 		
-		if(vals.length == 0 || vals[0] == null)
+		if(rv != null && rv.length == 0)
 			return null;
-		
-		var rv = new EqualizerPreset.basic(vals[0]);
-		
-		for(int i = 1; i < vals.length; ++i) {
-			rv.setGain(i-1, int.parse(vals[i]));
-		}
-		
+
 		return rv;
 	}
 	
@@ -458,13 +452,7 @@
 	}
 	
 	public void setSelectedPreset(EqualizerPreset preset) {
-		string toSave = preset.name;
-		
-		foreach(int gain in preset.gains) {
-			toSave += "," + gain.to_string();
-		}
-		
-		setString(SELECTED_PRESET, toSave);
+		setString(SELECTED_PRESET, (preset != null)? preset.name : "");
 	}
 
 	public void setPresets(Gee.Collection<EqualizerPreset> presets, string? type) {

=== modified file 'src/Widgets/PresetList.vala'
--- src/Widgets/PresetList.vala	2011-11-30 22:17:03 +0000
+++ src/Widgets/PresetList.vala	2011-12-05 01:21:23 +0000
@@ -5,9 +5,11 @@
 	LibraryWindow lw;
 	ListStore store;
 	
-	private int ndefaultpresets = 0;
-	private int ncustompresets = 0;
+	private int ndefaultpresets;
+	private int ncustompresets;
 
+	private bool default_presets_modified;
+	
 	private bool modifying_list;
 
 	public int preset_list_size {
@@ -15,9 +17,17 @@
 			return ndefaultpresets + ncustompresets;
 		}
 	}
-	
-	EqualizerPreset currentPreset;
-	
+
+	public bool default_presets_changed {
+		get {
+			return default_presets_modified;
+		} set {
+			default_presets_modified = value;
+		}
+	}
+	
+	public EqualizerPreset last_selected_preset;
+
 	public signal void preset_selected(EqualizerPreset p);
 	public signal void automatic_preset_chosen();
 	public signal void add_preset_chosen();
@@ -27,6 +37,8 @@
 		this.lm = lm;
 		this.lw = lw;
 
+		ndefaultpresets = 0;
+		ncustompresets = 0;
 		modifying_list = false;
 		
 		buildUI();
@@ -74,7 +86,7 @@
 			store.set(iter, 0, null, 1, "Add New...");
 		}
 
-		if((ndefaultpresets + ncustompresets) > 0) {
+		if(this.preset_list_size > 0) {
 			store.append(out iter);
 			store.set(iter, 0, null, 1, "Delete Current");
 		}
@@ -87,26 +99,23 @@
 		modifying_list = true;
 		TreeIter iter;
 
-		if((ndefaultpresets + ncustompresets) < 1) {
-		
-			clearList();
-		
-			if(ep.is_default)
-				ndefaultpresets++;
-			else
-				ncustompresets++;
-
-			addTopOptions();
-		}
-		else if(ep.is_default)
+		if(ep.is_default) {
 			ndefaultpresets++;
-		else
+			default_presets_modified = true;
+		} else {
 			ncustompresets++;
+		}
+
+		if((this.preset_list_size - 1) < 1) {
+			clearList();
+			addTopOptions();
+		}
 
 		store.append(out iter);
 		store.set(iter, 0, ep, 1, ep.name);
 
 		modifying_list = false;
+
 		// TODO: Sort item
 
 		set_active_iter(iter);
@@ -115,7 +124,7 @@
 	public void removeCurrentPreset() {
 		modifying_list = true;
 	
-		if(currentPreset == null || (ndefaultpresets + ncustompresets) < 1) {
+		if(last_selected_preset == null || this.preset_list_size < 1) {
 			return;
 		}
 		
@@ -124,20 +133,23 @@
 			GLib.Object o;
 			store.get(iter, 0, out o);
 			
-			if(o != null && o is EqualizerPreset && ((EqualizerPreset)o) == currentPreset) {
-				if(((EqualizerPreset)o).is_default)
+			if(o != null && o is EqualizerPreset && ((EqualizerPreset)o) == last_selected_preset) {
+				if (((EqualizerPreset)o).is_default) {
 					ndefaultpresets--;
-				else
+					default_presets_modified = true;
+				} else {
 					ncustompresets--;
+				}
 				
 				store.remove(iter);
 			}
 		}
 
-		if((ndefaultpresets + ncustompresets) < 1) {
+		if(this.preset_list_size < 1) {
 			clearList();
 			addTopOptions();
 		}
+		
 		modifying_list = false;
 		set_active(0);
 	}
@@ -154,7 +166,7 @@
 
 		if(o != null && o is EqualizerPreset) {
 			set_title(((EqualizerPreset)o).name);
-			currentPreset = (EqualizerPreset)o;
+			last_selected_preset = (EqualizerPreset)o;
 			preset_selected((EqualizerPreset)o);
 		}
 		else { // is Automatic, Add Preset or Delete Current
@@ -166,7 +178,7 @@
 			}
 			else {
 				delete_preset_chosen();
-				selectPreset(currentPreset);
+				selectPreset(last_selected_preset.name);
 			}
 		}
 	}
@@ -175,34 +187,36 @@
 		set_active(0);
 	}
 	
-	public void selectPreset(EqualizerPreset? p) {
-		if(p == null) {
+	public void selectPreset(string? preset_name) {
+		if(preset_name == null || preset_name.length < 1) {
 			set_active(0);
 		}
-		
+
 		TreeIter iter;
 		for(int i = 0; store.get_iter_from_string(out iter, i.to_string()); ++i) {
 			GLib.Object o;
 			store.get(iter, 0, out o);
-			
-			if(o != null && o is EqualizerPreset && ((EqualizerPreset)o).name == p.name) {
+
+			if(o != null && o is EqualizerPreset && ((EqualizerPreset)o).name == preset_name) {
 				set_active_iter(iter);
-				
 				return;
 			}
 		}
-		
+
 		set_active(0);
 	}
 	
-	public EqualizerPreset getSelectedPreset() {
+	public EqualizerPreset? getSelectedPreset() {
 		TreeIter it;
 		get_active_iter(out it);
 		
 		GLib.Object o;
 		store.get(it, 0, out o);
-		
-		return (EqualizerPreset)o;
+
+		if(o != null && o is EqualizerPreset)
+			return (EqualizerPreset)o;
+		else
+			return null;
 	}
 	
 	public Gee.Collection<EqualizerPreset> getPresets() {
@@ -220,3 +234,4 @@
 		return rv;
 	}
 }
+