PBD::strip_whitespace_edges() returns the empty string if the passed string is

all whitespace.  This allows for some mild code cleanup.  It's also declared in 
the PBD namespace now.

sfdb-v4 implemented.  Instead of fields that go across all files, there is now
just one tag field where you can enter comma delimited tags.  Searching for
tags to follow soon.  I recommend trashing your current ~/.ardour2/sfdb file.


git-svn-id: svn://localhost/ardour2/trunk@1182 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 36 deletions

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 3e461a85d7..77af855845 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -20,7 +20,6 @@
 
 #include <pbd/whitespace.h>
 
-#include <ardour/audio_library.h>
 #include <ardour/session.h>
 #include <ardour/audioengine.h>
 #include <ardour/configuration.h>
@@ -60,7 +59,6 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui)
 
 	  /* Paths */
 	  path_table (11, 2),
-	  sfdb_path_view(),
 
 	  /* Fades */
 
@@ -224,24 +222,10 @@ OptionEditor::setup_path_options()
 	path_table.attach (*label, 0, 1, 0, 1, FILL|EXPAND, FILL);
 	path_table.attach (session_raid_entry, 1, 3, 0, 1, Gtk::FILL|Gtk::EXPAND, FILL);
 
-	label = manage(new Label(_("Soundfile Search Paths")));
-	label->set_name("OptionsLabel");
-	path_table.attach(*label, 0, 1, 2, 3, FILL|EXPAND, FILL);
-	path_table.attach(sfdb_path_view, 1, 3, 2, 3, Gtk::FILL|Gtk::EXPAND, FILL);
-
-	sfdb_path_view.set_paths(Library->get_paths());
-	sfdb_path_view.PathsUpdated.connect (mem_fun(*this, &OptionEditor::sfdb_paths_changed));
-
 	path_table.show_all();
 }
 
 void
-OptionEditor::sfdb_paths_changed ()
-{
-	Library->set_paths (sfdb_path_view.get_paths());
-}
-
-void
 OptionEditor::add_session_paths ()
 {
 	click_path_entry.set_sensitive (true);
@@ -659,19 +643,12 @@ OptionEditor::click_sound_changed ()
 			return;
 		}
 
-		if (path.empty()) {
+		strip_whitespace_edges (path);
 
+		if (path == _("internal")) {
 			Config->set_click_sound ("");
-
 		} else {
-
-			strip_whitespace_edges (path);
-			
-			if (path == _("internal")) {
-				Config->set_click_sound ("");
-			} else {
-				Config->set_click_sound (path);
-			}
+			Config->set_click_sound (path);
 		}
 	}
 }
@@ -686,19 +663,12 @@ OptionEditor::click_emphasis_sound_changed ()
 			return;
 		}
 
-		if (path.empty()) {
+		strip_whitespace_edges (path);
 
+		if (path == _("internal")) {
 			Config->set_click_emphasis_sound ("");
-
 		} else {
-
-			strip_whitespace_edges (path);
-
-			if (path == _("internal")) {
-				Config->set_click_emphasis_sound ("");
-			} else {
-				Config->set_click_emphasis_sound (path);
-			}
+			Config->set_click_emphasis_sound (path);
 		}
 	}
 }