Merged with trunk R1304

git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf

16 files changed, 335 insertions, 253 deletions

diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev
index 3b65b2ec79..ff68e11fbe 100755
--- a/gtk2_ardour/ardev
+++ b/gtk2_ardour/ardev
@@ -1,3 +1,3 @@
 #!/bin/sh
 . `dirname "$0"`/ardev_common.sh
-exec $EXECUTABLE "$*"
+exec $EXECUTABLE $*
diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index 1bf1ffa94b..c661467d01 100644
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -6,6 +6,13 @@ export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$LD_LIBRARY_PATH
 # DYLD_LIBRARY_PATH is for Darwin
 export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 
+MLOCK_LIMIT=$(ulimit -l)
+if [ "$MLOCK_LIMIT" != "unlimited" ]; then
+	echo "WARNING: Your system has a limit for maximum amount of locked memory!"
+        echo "This might cause Ardour to run out of memory before your system runs out of memory. You can view the memory limit with 'ulimit -l', and it is normally controlled by /etc/security/limits.conf"
+
+fi
+
 exec %INSTALL_PREFIX%/%LIBDIR%/ardour2/ardour-%VERSION% $*
 
 
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b85278b8b5..07d322a1fb 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -39,6 +39,7 @@
 #include <pbd/pathscanner.h>
 #include <pbd/failed_constructor.h>
 #include <pbd/enumwriter.h>
+#include <pbd/stacktrace.h>
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/click_box.h>
@@ -113,7 +114,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 
 	  /* big clock */
 
-	  big_clock (X_("bigclock"), false, "BigClockNonRecording", true, false, true),
+	  big_clock (X_("bigclock"), false, "BigClockNonRecording", false, false, true),
 
 	  /* transport */
 
@@ -252,9 +253,10 @@ ARDOUR_UI::set_engine (AudioEngine& e)
 		throw failed_constructor();
 	}
 	
-	/* listen to clock mode changes */
+	/* set default clock modes */
 
-	AudioClock::ModeChanged.connect (mem_fun (*this, &ARDOUR_UI::store_clock_modes));
+	primary_clock.set_mode (AudioClock::SMPTE);
+	secondary_clock.set_mode (AudioClock::BBT);
 
 	/* start the time-of-day-clock */
 	
@@ -1834,6 +1836,7 @@ ARDOUR_UI::load_session (const string & path, const string & snap_name, string*
 	Session *new_session;
 	int x;
 	session_loaded = false;
+	
 	x = unload_session ();
 
 	if (x < 0) {
@@ -2447,6 +2450,8 @@ ARDOUR_UI::update_transport_clocks (nframes_t pos)
 void
 ARDOUR_UI::record_state_changed ()
 {
+	ENSURE_GUI_THREAD (mem_fun (*this, &ARDOUR_UI::record_state_changed));
+
 	if (!session || !big_clock_window) {
 		/* why bother - the clock isn't visible */
 		return;
@@ -2454,10 +2459,10 @@ ARDOUR_UI::record_state_changed ()
 
 	switch (session->record_status()) {
 	case Session::Recording:
-		big_clock.set_name ("BigClockRecording");
+		big_clock.set_widget_name ("BigClockRecording");
 		break;
 	default:
-		big_clock.set_name ("BigClockNonRecording");
+		big_clock.set_widget_name ("BigClockNonRecording");
 		break;
 	}
 }
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 27b852982a..a39bcb124d 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -325,9 +325,6 @@ ARDOUR_UI::setup_transport ()
 	ARDOUR_UI::Clock.connect (bind (mem_fun (primary_clock, &AudioClock::set), false));
 	ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), false));
 
-	primary_clock.set_mode (AudioClock::SMPTE);
-	secondary_clock.set_mode (AudioClock::BBT);
-
 	primary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed));
 	secondary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
 
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index a9a61176a9..140ee649ea 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -125,6 +125,13 @@ ARDOUR_UI::connect_to_session (Session *s)
 	
 	connect_dependents_to_session (s);
 
+	/* listen to clock mode changes. don't do this earlier because otherwise as the clocks
+	   restore their modes or are explicitly set, we will cause the "new" mode to be saved
+	   back to the session XML ("extra") state.
+	 */
+
+	AudioClock::ModeChanged.connect (mem_fun (*this, &ARDOUR_UI::store_clock_modes));
+
 	start_clocking ();
 	start_blinking ();
 
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 7ad7e4df65..66822289c2 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -599,7 +599,7 @@ AudioClock::set_session (Session *s)
 		AudioClock::Mode amode;
 		
 		if (node) {
-			if ((prop = node->property (_name.c_str())) != 0) {
+			if ((prop = node->property (_name)) != 0) {
 				amode = AudioClock::Mode (string_2_enum (prop->value(), amode));
 				set_mode (amode);
 			}
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 14b93c7182..d0898d32f4 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -223,7 +223,7 @@ AudioStreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
 			++tmp;
 			
 			boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(r);
-			if (ar && (*i)->crossfade.involves (ar)) {
+			if (ar && (*i)->crossfade->involves (ar)) {
 				delete *i;
 				crossfade_views.erase (i);
 			}
@@ -274,17 +274,17 @@ AudioStreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
 }
 
 void
-AudioStreamView::add_crossfade (Crossfade *crossfade)
+AudioStreamView::add_crossfade (boost::shared_ptr<Crossfade> crossfade)
 {
 	AudioRegionView* lview = 0;
 	AudioRegionView* rview = 0;
-
+	
 	ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_crossfade), crossfade));
 
 	/* first see if we already have a CrossfadeView for this Crossfade */
 
 	for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-		if ((*i)->crossfade == *crossfade) {
+		if ((*i)->crossfade == crossfade) {
 			if (!crossfades_visible) {
 				(*i)->hide();
 			} else {
@@ -310,7 +310,7 @@ AudioStreamView::add_crossfade (Crossfade *crossfade)
 
 	CrossfadeView *cv = new CrossfadeView (_trackview.canvas_display,
 					       _trackview,
-					       *crossfade,
+					        crossfade,
 					       _samples_per_unit,
 					       region_color,
 					       *lview, *rview);
@@ -324,12 +324,12 @@ AudioStreamView::add_crossfade (Crossfade *crossfade)
 }
 
 void
-AudioStreamView::remove_crossfade (Crossfade *xfade)
+AudioStreamView::remove_crossfade (boost::shared_ptr<Crossfade> xfade)
 {
 	ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_crossfade), xfade));
 
 	for (list<CrossfadeView*>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-		if (&(*i)->crossfade == xfade) {
+		if ((*i)->crossfade == xfade) {
 			delete *i;
 			crossfade_views.erase (i);
 			break;
@@ -716,7 +716,7 @@ void
 AudioStreamView::hide_xfades_involving (AudioRegionView& rv)
 {
 	for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-		if ((*i)->crossfade.involves (rv.audio_region())) {
+		if ((*i)->crossfade->involves (rv.audio_region())) {
 			(*i)->fake_hide ();
 		}
 	}
@@ -726,7 +726,7 @@ void
 AudioStreamView::reveal_xfades_involving (AudioRegionView& rv)
 {
 	for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-		if ((*i)->crossfade.involves (rv.audio_region()) && (*i)->visible()) {
+		if ((*i)->crossfade->involves (rv.audio_region()) && (*i)->visible()) {
 			(*i)->show ();
 		}
 	}
diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index ba0767a5e4..c52a10baeb 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -93,8 +93,8 @@ class AudioStreamView : public StreamView
 	void playlist_modified ();
 	void playlist_changed (boost::shared_ptr<ARDOUR::Diskstream>);
 
-	void add_crossfade (ARDOUR::Crossfade*);
-	void remove_crossfade (ARDOUR::Crossfade*);
+	void add_crossfade (boost::shared_ptr<ARDOUR::Crossfade>);
+	void remove_crossfade (boost::shared_ptr<ARDOUR::Crossfade>);
 
 	void color_handler (ColorID id, uint32_t val);
 	
diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index cf1994eb06..208ef13aab 100644
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -72,7 +72,7 @@ CrossfadeEditor::Half::Half ()
 {
 }
 
-CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double mxy)
+CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, double my, double mxy)
 	: ArdourDialog (_("ardour: x-fade edit")),
 	  xfade (xf),
 	  session (s),
@@ -279,14 +279,14 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m
 //	vpacker.pack_start (*foobut, false, false);
 
 	current = In;
-	set (xfade.fade_in(), In);
+	set (xfade->fade_in(), In);
 
 	current = Out;
-	set (xfade.fade_out(), Out);
+	set (xfade->fade_out(), Out);
 
 	curve_select_clicked (In);
 
-	xfade.StateChanged.connect (mem_fun(*this, &CrossfadeEditor::xfade_changed));
+	xfade->StateChanged.connect (mem_fun(*this, &CrossfadeEditor::xfade_changed));
 
 	session.AuditionActive.connect (mem_fun(*this, &CrossfadeEditor::audition_state_changed));
 	show_all_children();
@@ -577,21 +577,21 @@ CrossfadeEditor::canvas_allocation (Gtk::Allocation& alloc)
 	redraw ();
 	current = old_current;
 
-	double spu = xfade.length() / (double) effective_width();
+	double spu = xfade->length() / (double) effective_width();
 
 	if (fade[In].waves.empty()) {
-		make_waves (xfade.in(), In);
+		make_waves (xfade->in(), In);
 	}
 
 	if (fade[Out].waves.empty()) {
-		make_waves (xfade.out(), Out);
+		make_waves (xfade->out(), Out);
 	}
 
 	double ht;
 	vector<ArdourCanvas::WaveView*>::iterator i;
 	uint32_t n;
 
-	ht = canvas->get_allocation().get_height() / xfade.in()->n_channels();
+	ht = canvas->get_allocation().get_height() / xfade->in()->n_channels();
 
 	for (n = 0, i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i, ++n) {
 		double yoff;
@@ -603,7 +603,7 @@ CrossfadeEditor::canvas_allocation (Gtk::Allocation& alloc)
 		(*i)->property_samples_per_unit() = spu;
 	}
 
-	ht = canvas->get_allocation().get_height() / xfade.out()->n_channels();
+	ht = canvas->get_allocation().get_height() / xfade->out()->n_channels();
 
 	for (n = 0, i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i, ++n) {
 		double yoff;
@@ -621,8 +621,8 @@ CrossfadeEditor::canvas_allocation (Gtk::Allocation& alloc)
 void
 CrossfadeEditor::xfade_changed (Change ignored)
 {
-	set (xfade.fade_in(), In);
-	set (xfade.fade_out(), Out);
+	set (xfade->fade_in(), In);
+	set (xfade->fade_out(), Out);
 }
 
 void
@@ -632,7 +632,7 @@ CrossfadeEditor::redraw ()
 		return;
 	}
 
-	nframes_t len = xfade.length ();
+	nframes_t len = xfade->length ();
 
 	fade[current].normative_curve.clear ();
 	fade[current].gain_curve.clear ();
@@ -741,11 +741,11 @@ CrossfadeEditor::apply_preset (Preset *preset)
 void
 CrossfadeEditor::apply ()
 {
-	_apply_to (&xfade);
+	_apply_to (xfade);
 }
 
 void
-CrossfadeEditor::_apply_to (Crossfade* xf)
+CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
 {
 	ARDOUR::Curve& in (xf->fade_in());
 	ARDOUR::Curve& out (xf->fade_out());
@@ -796,7 +796,7 @@ CrossfadeEditor::_apply_to (Crossfade* xf)
 }
 
 void
-CrossfadeEditor::setup (Crossfade* xfade)
+CrossfadeEditor::setup (boost::shared_ptr<Crossfade> xfade)
 {
 	_apply_to (xfade);
 	xfade->set_active (true);
@@ -819,8 +819,8 @@ CrossfadeEditor::clear ()
 void
 CrossfadeEditor::reset ()
 {
-	set (xfade.fade_in(),  In);
-	set (xfade.fade_out(), Out);
+	set (xfade->fade_in(),  In);
+	set (xfade->fade_out(), Out);
 }
 
 void
@@ -1028,7 +1028,7 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
 	}
 
 	ht = canvas->get_allocation().get_height() / (double) nchans;
-	spu = xfade.length() / (double) effective_width();
+	spu = xfade->length() / (double) effective_width();
 
 	for (uint32_t n = 0; n < nchans; ++n) {
 		
@@ -1095,25 +1095,25 @@ CrossfadeEditor::audition_both ()
 		postroll = 0;
 	}
 
- 	if ((left_start_offset = xfade.out()->length() - xfade.length()) >= preroll) {
+ 	if ((left_start_offset = xfade->out()->length() - xfade->length()) >= preroll) {
   		left_start_offset -= preroll;
   	} 
 
 	length = 0;
 
- 	if ((left_length = xfade.length()) < xfade.out()->length() - left_start_offset) {
+ 	if ((left_length = xfade->length()) < xfade->out()->length() - left_start_offset) {
   		length += postroll;
   	}
 
-	right_length = xfade.length();
+	right_length = xfade->length();
 
-	if (xfade.in()->length() - right_length < postroll) {
+	if (xfade->in()->length() - right_length < postroll) {
 		right_length += postroll;
 	}
 
-	boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), left_start_offset, left_length, "xfade out", 
+	boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->out(), left_start_offset, left_length, "xfade out", 
 													      0, Region::DefaultFlags, false)));
-	boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.in(), 0, right_length, "xfade in", 
+	boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->in(), 0, right_length, "xfade in", 
 													       0, Region::DefaultFlags, false)));
 	
 	pl.add_region (left, 0);
@@ -1129,7 +1129,7 @@ CrossfadeEditor::audition_both ()
 void
 CrossfadeEditor::audition_left_dry ()
 {
-	boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), xfade.out()->length() - xfade.length(), xfade.length(), "xfade left", 
+	boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->out(), xfade->out()->length() - xfade->length(), xfade->length(), "xfade left", 
 													      0, Region::DefaultFlags, false)));
 	
 	session.audition_region (left);
@@ -1140,9 +1140,9 @@ CrossfadeEditor::audition_left ()
 {
 	AudioPlaylist& pl (session.the_auditioner()->prepare_playlist());
 
-	boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), xfade.out()->length() - xfade.length(), xfade.length(), "xfade left", 
+	boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->out(), xfade->out()->length() - xfade->length(), xfade->length(), "xfade left", 
 													      0, Region::DefaultFlags, false)));
-	boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.in(), 0, xfade.length(), "xfade in", 
+	boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->in(), 0, xfade->length(), "xfade in", 
 													       0, Region::DefaultFlags, false)));
 
 	pl.add_region (left, 0);
@@ -1162,7 +1162,7 @@ CrossfadeEditor::audition_left ()
 void
 CrossfadeEditor::audition_right_dry ()
 {
-	boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.in(), 0, xfade.length(), "xfade in", 
+	boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->in(), 0, xfade->length(), "xfade in", 
 													       0, Region::DefaultFlags, false)));
 	session.audition_region (right);
 }
@@ -1172,9 +1172,9 @@ CrossfadeEditor::audition_right ()
 {
 	AudioPlaylist& pl (session.the_auditioner()->prepare_playlist());
 
-	boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), xfade.out()->length() - xfade.length(), xfade.length(), "xfade out", 
+	boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->out(), xfade->out()->length() - xfade->length(), xfade->length(), "xfade out", 
 													      0, Region::DefaultFlags, false)));
-					     boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), 0, xfade.length(), "xfade out", 
+					     boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade->out(), 0, xfade->length(), "xfade out", 
 													       0, Region::DefaultFlags, false)));
 
 	pl.add_region (left, 0);
diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index ad0661c036..3c9a6a13c1 100644
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -21,170 +21,170 @@ namespace ARDOUR
 class CrossfadeEditor : public ArdourDialog
 {
   public:
-    CrossfadeEditor (ARDOUR::Session&, ARDOUR::Crossfade&, double miny, double maxy);
-    ~CrossfadeEditor ();
-    
-    void apply ();
-
-    static const double canvas_border;
-    
-    /* these are public so that a caller/subclass can make them do the right thing.
-     */
-    
-    Gtk::Button* cancel_button;
-    Gtk::Button* ok_button;
-
-    struct PresetPoint {
-	double x;
-	double y;
-
-	PresetPoint (double a, double b) 
-		: x (a), y (b) {}
-    };
-
-    struct Preset : public list<PresetPoint> {
-	string xpm;
+	CrossfadeEditor (ARDOUR::Session&, boost::shared_ptr<ARDOUR::Crossfade>, double miny, double maxy);
+	~CrossfadeEditor ();
+	
+	void apply ();
+	
+	static const double canvas_border;
+	
+	/* these are public so that a caller/subclass can make them do the right thing.
+	 */
+	
+	Gtk::Button* cancel_button;
+	Gtk::Button* ok_button;
+	
+	struct PresetPoint {
+	    double x;
+	    double y;
+	    
+	    PresetPoint (double a, double b) 
+		    : x (a), y (b) {}
+	};
+	
+	struct Preset : public list<PresetPoint> {
+	    string xpm;
+	    
+	    Preset (string x)
+		    : xpm (x) {}
+	};
+	
+	typedef list<Preset*> Presets;
+	
+	static Presets* fade_in_presets;
+	static Presets* fade_out_presets;
 	
-	Preset (string x)
-		: xpm (x) {}
-    };
-
-    typedef list<Preset*> Presets;
-
-    static Presets* fade_in_presets;
-    static Presets* fade_out_presets;
-
   private:
-    ARDOUR::Crossfade& xfade;
-    ARDOUR::Session& session;
-
-    Gtk::VBox vpacker;
-
-    struct Point {
-	~Point();
-
-	ArdourCanvas::SimpleRect* box;
-	ArdourCanvas::Line* curve;
-	double x;
-	double y;
-
-	static const int32_t size;
-
-	void move_to (double x, double y, double xfract, double yfract);
-    };
-
-    struct PointSorter 
-    {
-	bool operator() (const CrossfadeEditor::Point* a, const CrossfadeEditor::Point *b) {
-		return a->x < b->x;
-	}
-    };
-
-    ArdourCanvas::SimpleRect*   toplevel;
-    ArdourCanvas::Canvas* canvas;
-
-    struct Half {
-	ArdourCanvas::Line*     line;
-	ArdourCanvas::Polygon*  shading;
-	list<Point*>            points;
-	ARDOUR::Curve           normative_curve; /* 0 - 1.0, linear */
-	ARDOUR::Curve           gain_curve;      /* 0 - 2.0, gain mapping */
-	vector<ArdourCanvas::WaveView*>  waves;
-
-	Half();
-    };
-
-    enum WhichFade {
-	    In = 0,
-	    Out = 1
-    };
-
-    Half fade[2];
-    WhichFade current;
-
-    bool point_grabbed;
-    vector<Gtk::Button*> fade_out_buttons;
-    vector<Gtk::Button*> fade_in_buttons;
+	boost::shared_ptr<ARDOUR::Crossfade> xfade;
+	ARDOUR::Session& session;
+	
+	Gtk::VBox vpacker;
+	
+	struct Point {
+	    ~Point();
+	    
+	    ArdourCanvas::SimpleRect* box;
+	    ArdourCanvas::Line* curve;
+	    double x;
+	    double y;
+	    
+	    static const int32_t size;
+	    
+	    void move_to (double x, double y, double xfract, double yfract);
+	};
+	
+	struct PointSorter 
+	{
+	    bool operator() (const CrossfadeEditor::Point* a, const CrossfadeEditor::Point *b) {
+		    return a->x < b->x;
+	    }
+	};
+	
+	ArdourCanvas::SimpleRect*   toplevel;
+	ArdourCanvas::Canvas* canvas;
+	
+	struct Half {
+	    ArdourCanvas::Line*     line;
+	    ArdourCanvas::Polygon*  shading;
+	    list<Point*>            points;
+	    ARDOUR::Curve           normative_curve; /* 0 - 1.0, linear */
+	    ARDOUR::Curve           gain_curve;      /* 0 - 2.0, gain mapping */
+	    vector<ArdourCanvas::WaveView*>  waves;
+	    
+	    Half();
+	};
+	
+	enum WhichFade {
+		In = 0,
+		Out = 1
+	};
+	
+	Half fade[2];
+	WhichFade current;
+	
+	bool point_grabbed;
+	vector<Gtk::Button*> fade_out_buttons;
+	vector<Gtk::Button*> fade_in_buttons;
 
-    Gtk::VBox vpacker2;
+	Gtk::VBox vpacker2;
 
-    Gtk::Button clear_button;
-    Gtk::Button revert_button;
+	Gtk::Button clear_button;
+	Gtk::Button revert_button;
 
-    Gtk::ToggleButton audition_both_button;
-    Gtk::ToggleButton audition_left_dry_button;
-    Gtk::ToggleButton audition_left_button;
-    Gtk::ToggleButton audition_right_dry_button;
-    Gtk::ToggleButton audition_right_button;
+	Gtk::ToggleButton audition_both_button;
+	Gtk::ToggleButton audition_left_dry_button;
+	Gtk::ToggleButton audition_left_button;
+	Gtk::ToggleButton audition_right_dry_button;
+	Gtk::ToggleButton audition_right_button;
 
-    Gtk::ToggleButton preroll_button;
-    Gtk::ToggleButton postroll_button;
+	Gtk::ToggleButton preroll_button;
+	Gtk::ToggleButton postroll_button;
 
-    Gtk::HBox roll_box;
+	Gtk::HBox roll_box;
 
-    gint event_handler (GdkEvent*);
+	gint event_handler (GdkEvent*);
 
-    bool canvas_event (GdkEvent* event);
-    bool point_event (GdkEvent* event, Point*);
-    bool curve_event (GdkEvent* event);
+	bool canvas_event (GdkEvent* event);
+	bool point_event (GdkEvent* event, Point*);
+	bool curve_event (GdkEvent* event);
 
-    void canvas_allocation (Gtk::Allocation&);
-    void add_control_point (double x, double y);
-    Point* make_point ();
-    void redraw ();
+	void canvas_allocation (Gtk::Allocation&);
+	void add_control_point (double x, double y);
+	Point* make_point ();
+	void redraw ();
     
-    double effective_width () const { return canvas->get_allocation().get_width() - (2.0 * canvas_border); }
-    double effective_height () const { return canvas->get_allocation().get_height() - (2.0 * canvas_border); }
+	double effective_width () const { return canvas->get_allocation().get_width() - (2.0 * canvas_border); }
+	double effective_height () const { return canvas->get_allocation().get_height() - (2.0 * canvas_border); }
 
-    void clear ();
-    void reset ();
+	void clear ();
+	void reset ();
 
-    double miny;
-    double maxy;
+	double miny;
+	double maxy;
 
-    Gtk::Table fade_in_table;
-    Gtk::Table fade_out_table;
+	Gtk::Table fade_in_table;
+	Gtk::Table fade_out_table;
 
-    void build_presets ();
-    void apply_preset (Preset*);
+	void build_presets ();
+	void apply_preset (Preset*);
     
-    Gtk::RadioButton select_in_button;
-    Gtk::RadioButton select_out_button;
-    Gtk::HBox   curve_button_box;
-    Gtk::HBox   audition_box;
+	Gtk::RadioButton select_in_button;
+	Gtk::RadioButton select_out_button;
+	Gtk::HBox   curve_button_box;
+	Gtk::HBox   audition_box;
 
-    void curve_select_clicked (WhichFade);
+	void curve_select_clicked (WhichFade);
 
-    double x_coordinate (double& xfract) const;
-    double y_coordinate (double& yfract) const;
+	double x_coordinate (double& xfract) const;
+	double y_coordinate (double& yfract) const;
     
-    void set (const ARDOUR::Curve& alist, WhichFade);
+	void set (const ARDOUR::Curve& alist, WhichFade);
 
-    sigc::connection peaks_ready_connection;
+	sigc::connection peaks_ready_connection;
 
-    void make_waves (boost::shared_ptr<ARDOUR::AudioRegion>, WhichFade);
-    void peaks_ready (boost::shared_ptr<ARDOUR::AudioRegion> r, WhichFade);
+	void make_waves (boost::shared_ptr<ARDOUR::AudioRegion>, WhichFade);
+	void peaks_ready (boost::shared_ptr<ARDOUR::AudioRegion> r, WhichFade);
     
-    void _apply_to (ARDOUR::Crossfade* xf);
-    void setup (ARDOUR::Crossfade*);
-    void cancel_audition ();
-    void audition_state_changed (bool);
-
-    void audition_toggled ();
-    void audition_right_toggled ();
-    void audition_right_dry_toggled ();
-    void audition_left_toggled ();
-    void audition_left_dry_toggled ();
-
-    void audition_both ();
-    void audition_left_dry ();
-    void audition_left ();
-    void audition_right_dry ();
-    void audition_right ();
-
-    void xfade_changed (ARDOUR::Change);
-
-    void dump ();
+	void _apply_to (boost::shared_ptr<ARDOUR::Crossfade> xf);
+	void setup (boost::shared_ptr<ARDOUR::Crossfade>);
+	void cancel_audition ();
+	void audition_state_changed (bool);
+
+	void audition_toggled ();
+	void audition_right_toggled ();
+	void audition_right_dry_toggled ();
+	void audition_left_toggled ();
+	void audition_left_dry_toggled ();
+
+	void audition_both ();
+	void audition_left_dry ();
+	void audition_left ();
+	void audition_right_dry ();
+	void audition_right ();
+
+	void xfade_changed (ARDOUR::Change);
+
+	void dump ();
 };
 
 #endif /* __gtk_ardour_xfade_edit_h__ */
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc
index 7567b04282..281a3251bc 100644
--- a/gtk2_ardour/crossfade_view.cc
+++ b/gtk2_ardour/crossfade_view.cc
@@ -44,15 +44,15 @@ sigc::signal<void,CrossfadeView*> CrossfadeView::GoingAway;
 
 CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, 
 			      RouteTimeAxisView &tv, 
-			      Crossfade& xf, 
+			      boost::shared_ptr<Crossfade> xf, 
 			      double spu,
 			      Gdk::Color& basic_color,
 			      AudioRegionView& lview,
 			      AudioRegionView& rview)
 			      
 
-	: TimeAxisViewItem ("xfade" /*xf.name()*/, *parent, tv, spu, basic_color, xf.position(), 
-			    xf.length(), TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)),
+	: TimeAxisViewItem ("xfade" /*xf.name()*/, *parent, tv, spu, basic_color, xf->position(), 
+			    xf->length(), TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)),
 	  crossfade (xf),
 	  left_view (lview),
 	  right_view (rview)
@@ -84,7 +84,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
 	
 	crossfade_changed (Change (~0));
 
-	crossfade.StateChanged.connect (mem_fun(*this, &CrossfadeView::crossfade_changed));
+	crossfade->StateChanged.connect (mem_fun(*this, &CrossfadeView::crossfade_changed));
 }
 
 CrossfadeView::~CrossfadeView ()
@@ -123,8 +123,8 @@ CrossfadeView::crossfade_changed (Change what_changed)
 	bool need_redraw_curves = false;
 
 	if (what_changed & BoundsChanged) {
-		set_position (crossfade.position(), this);
-		set_duration (crossfade.length(), this);
+		set_position (crossfade->position(), this);
+		set_duration (crossfade->length(), this);
 		need_redraw_curves = true;
 	}
 
@@ -148,7 +148,7 @@ CrossfadeView::redraw_curves ()
 	float* vec;
 	double h;
 
-	if (!crossfade.following_overlap()) {
+	if (!crossfade->following_overlap()) {
 		/* curves should not be visible */
 		fade_in->hide ();
 		fade_out->hide ();
@@ -172,10 +172,10 @@ CrossfadeView::redraw_curves ()
 		return;
 	}
 
-	npoints = get_time_axis_view().editor.frame_to_pixel (crossfade.length());
+	npoints = get_time_axis_view().editor.frame_to_pixel (crossfade->length());
 	npoints = std::min (gdk_screen_width(), npoints);
 
-	if (!_visible || !crossfade.active() || npoints < 3) {
+	if (!_visible || !crossfade->active() || npoints < 3) {
 		fade_in->hide();
 		fade_out->hide();
 		return;
@@ -187,7 +187,7 @@ CrossfadeView::redraw_curves ()
 	points = get_canvas_points ("xfade edit redraw", npoints);
 	vec = new float[npoints];
 
-	crossfade.fade_in().get_vector (0, crossfade.length(), vec, npoints);
+	crossfade->fade_in().get_vector (0, crossfade->length(), vec, npoints);
 	for (int i = 0, pci = 0; i < npoints; ++i) {
 		Art::Point &p = (*points)[pci++];
 		p.set_x(i);
@@ -195,7 +195,7 @@ CrossfadeView::redraw_curves ()
 	}
 	fade_in->property_points() = *points;
 
-	crossfade.fade_out().get_vector (0, crossfade.length(), vec, npoints);
+	crossfade->fade_out().get_vector (0, crossfade->length(), vec, npoints);
 	for (int i = 0, pci = 0; i < npoints; ++i) {
 		Art::Point &p = (*points)[pci++];
 		p.set_x(i);
@@ -217,7 +217,7 @@ CrossfadeView::redraw_curves ()
 void
 CrossfadeView::active_changed ()
 {
-	if (crossfade.active()) {
+	if (crossfade->active()) {
 		frame->property_fill_color_rgba() = color_map[cActiveCrossfade];
 	} else {
 		frame->property_fill_color_rgba() = color_map[cInactiveCrossfade];
diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index adbd74b420..730813f78c 100644
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -35,14 +35,15 @@ struct CrossfadeView : public TimeAxisViewItem
 {
     CrossfadeView (ArdourCanvas::Group*, 
 		   RouteTimeAxisView&,
-		   ARDOUR::Crossfade&,
+		   boost::shared_ptr<ARDOUR::Crossfade>,
 		   double initial_samples_per_unit, 
 		   Gdk::Color& basic_color,
 		   AudioRegionView& leftview,
 		   AudioRegionView& rightview);
     ~CrossfadeView ();
 
-    ARDOUR::Crossfade& crossfade;  // ok, let 'em have it
+    boost::shared_ptr<ARDOUR::Crossfade> crossfade;  // ok, let 'em have it
+
     AudioRegionView& left_view;    // and these too
     AudioRegionView& right_view;
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 3c1c89f927..621b76a1e1 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -901,6 +901,8 @@ Editor::instant_save ()
 void
 Editor::reposition_x_origin (nframes_t frame)
 {
+	cerr << "repsosition to " << frame << endl;
+
 	if (frame != leftmost_frame) {
 		leftmost_frame = frame;
 		
@@ -1141,6 +1143,13 @@ Editor::connect_to_session (Session *t)
 {
 	session = t;
 
+	XMLNode* node = ARDOUR_UI::instance()->editor_settings();
+	set_state (*node);
+
+	/* catch up with the playhead */
+
+	session->request_locate (playhead_cursor->current_frame);
+
 	if (first_action_message) {
 	        first_action_message->hide();
 	}
@@ -1237,27 +1246,12 @@ Editor::connect_to_session (Session *t)
 		(static_cast<TimeAxisView*>(*i))->set_samples_per_unit (frames_per_unit);
 	}
 
-	/* ::reposition_x_origin() doesn't work right here, since the old
-	   position may be zero already, and it does nothing in such
-	   circumstances.
-	*/
-
-	leftmost_frame = 0;
-	
-	horizontal_adjustment.set_value (0);
-
 	restore_ruler_visibility ();
 	//tempo_map_changed (Change (0));
 	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 
-	edit_cursor->set_position (0);
-	playhead_cursor->set_position (0);
-
 	start_scrolling ();
 
-	XMLNode* node = ARDOUR_UI::instance()->editor_settings();
-	set_state (*node);
-
 	/* don't show master bus in a new session */
 
 	if (ARDOUR_UI::instance()->session_is_new ()) {
@@ -1650,7 +1644,7 @@ Editor::build_track_selection_context_menu (nframes_t ignored)
 }
 
 void
-Editor::add_crossfade_context_items (AudioStreamView* view, Crossfade* xfade, Menu_Helpers::MenuList& edit_items, bool many)
+Editor::add_crossfade_context_items (AudioStreamView* view, boost::shared_ptr<Crossfade> xfade, Menu_Helpers::MenuList& edit_items, bool many)
 {
 	using namespace Menu_Helpers;
 	Menu     *xfade_menu = manage (new Menu);
@@ -1664,8 +1658,8 @@ Editor::add_crossfade_context_items (AudioStreamView* view, Crossfade* xfade, Me
 		str = _("Unmute");
 	}
 
-	items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_active), xfade)));
-	items.push_back (MenuElem (_("Edit"), bind (mem_fun(*this, &Editor::edit_xfade), xfade)));
+	items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_active), boost::weak_ptr<Crossfade> (xfade))));
+	items.push_back (MenuElem (_("Edit"), bind (mem_fun(*this, &Editor::edit_xfade), boost::weak_ptr<Crossfade> (xfade))));
 
 	if (xfade->can_follow_overlap()) {
 
@@ -2115,6 +2109,28 @@ Editor::set_state (const XMLNode& node)
 	set_default_size (g.base_width, g.base_height);
 	move (x, y);
 
+	if (session && (prop = node.property ("playhead"))) {
+		nframes_t pos = atol (prop->value().c_str());
+		playhead_cursor->set_position (pos);
+	} else {
+		playhead_cursor->set_position (0);
+
+		/* ::reposition_x_origin() doesn't work right here, since the old
+		   position may be zero already, and it does nothing in such
+		   circumstances.
+		*/
+		
+		leftmost_frame = 0;
+		horizontal_adjustment.set_value (0);
+	}
+
+	if (session && (prop = node.property ("edit-cursor"))) {
+		nframes_t pos = atol (prop->value().c_str());
+		edit_cursor->set_position (pos);
+	} else {
+		edit_cursor->set_position (0);
+	}
+
 	if ((prop = node.property ("zoom-focus"))) {
 		set_zoom_focus ((ZoomFocus) atoi (prop->value()));
 	}
@@ -2264,6 +2280,11 @@ Editor::get_state ()
 	snprintf (buf, sizeof(buf), "%d", (int) snap_mode);
 	node->add_property ("snap-mode", buf);
 
+	snprintf (buf, sizeof (buf), "%" PRIu32, playhead_cursor->current_frame);
+	node->add_property ("playhead", buf);
+	snprintf (buf, sizeof (buf), "%" PRIu32, edit_cursor->current_frame);
+	node->add_property ("edit-cursor", buf);
+
 	node->add_property ("show-waveforms", _show_waveforms ? "yes" : "no");
 	node->add_property ("show-waveforms-recording", _show_waveforms_recording ? "yes" : "no");
 	node->add_property ("show-measures", _show_measures ? "yes" : "no");
@@ -3901,21 +3922,33 @@ Editor::set_follow_playhead (bool yn)
 }
 
 void
-Editor::toggle_xfade_active (Crossfade* xfade)
+Editor::toggle_xfade_active (boost::weak_ptr<Crossfade> wxfade)
 {
-	xfade->set_active (!xfade->active());
+	boost::shared_ptr<Crossfade> xfade (wxfade.lock());
+	if (xfade) {
+		xfade->set_active (!xfade->active());
+	}
 }
 
 void
-Editor::toggle_xfade_length (Crossfade* xfade)
+Editor::toggle_xfade_length (boost::weak_ptr<Crossfade> wxfade)
 {
-	xfade->set_follow_overlap (!xfade->following_overlap());
+	boost::shared_ptr<Crossfade> xfade (wxfade.lock());
+	if (xfade) {
+		xfade->set_follow_overlap (!xfade->following_overlap());
+	}
 }
 
 void
-Editor::edit_xfade (Crossfade* xfade)
+Editor::edit_xfade (boost::weak_ptr<Crossfade> wxfade)
 {
-	CrossfadeEditor cew (*session, *xfade, xfade->fade_in().get_min_y(), 1.0);
+	boost::shared_ptr<Crossfade> xfade (wxfade.lock());
+
+	if (!xfade) {
+		return;
+	}
+
+	CrossfadeEditor cew (*session, xfade, xfade->fade_in().get_min_y(), 1.0);
 		
 	ensure_float (cew);
 	
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 63f8adaf48..55866a608c 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -464,7 +464,7 @@ class Editor : public PublicEditor
 	void add_dstream_context_items (Gtk::Menu_Helpers::MenuList&);
 	void add_bus_context_items (Gtk::Menu_Helpers::MenuList&);
 	void add_region_context_items (AudioStreamView*, boost::shared_ptr<ARDOUR::Region>, Gtk::Menu_Helpers::MenuList&);
-	void add_crossfade_context_items (AudioStreamView*, ARDOUR::Crossfade*, Gtk::Menu_Helpers::MenuList&, bool many);
+	void add_crossfade_context_items (AudioStreamView*, boost::shared_ptr<ARDOUR::Crossfade>, Gtk::Menu_Helpers::MenuList&, bool many);
 	void add_selection_context_items (Gtk::Menu_Helpers::MenuList&);
 
 	void handle_new_route (ARDOUR::Session::RouteList&);
@@ -1735,9 +1735,9 @@ class Editor : public PublicEditor
 	ImageFrameSocketHandler* image_socket_listener ;
 	/* </CMT Additions> */
 
-	void toggle_xfade_active (ARDOUR::Crossfade*);
-	void toggle_xfade_length (ARDOUR::Crossfade*);
-	void edit_xfade (ARDOUR::Crossfade*);
+	void toggle_xfade_active (boost::weak_ptr<ARDOUR::Crossfade>);
+	void toggle_xfade_length (boost::weak_ptr<ARDOUR::Crossfade>);
+	void edit_xfade (boost::weak_ptr<ARDOUR::Crossfade>);
 	void xfade_edit_left_region ();
 	void xfade_edit_right_region ();
 
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index ea4848b882..d8889c1af7 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -2779,8 +2779,14 @@ Editor::freeze_route ()
 	itt.done = false;
 	itt.cancel = false;
 	itt.progress = 0.0f;
+	
+	pthread_attr_t attr;
+	pthread_attr_init(&attr);
+	pthread_attr_setstacksize(&attr, 500000);
+
+	pthread_create (&itt.thread, &attr, _freeze_thread, this);
 
-	pthread_create (&itt.thread, 0, _freeze_thread, this);
+	pthread_attr_destroy(&attr);
 
 	track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
 
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 5d3be0399b..6751fc311c 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -21,6 +21,8 @@
 #include <cerrno>
 #include <sstream>
 
+#include <sys/stat.h>
+
 #include <gtkmm/box.h>
 #include <gtkmm/stock.h>
 
@@ -65,6 +67,8 @@ SoundFileBox::SoundFileBox ()
 	border_frame.set_label (_("Soundfile Info"));
 	border_frame.add (main_box);
 
+	Gtk::Label* tag_label = manage(new Gtk::Label(_("comma seperated tags")));
+
 	pack_start (border_frame);
 	set_border_width (4);
 
@@ -75,7 +79,8 @@ SoundFileBox::SoundFileBox ()
 	main_box.pack_start(channels, false, false);
 	main_box.pack_start(samplerate, false, false);
 	main_box.pack_start(timecode, false, false);
-	main_box.pack_start(tags_entry, true, true);
+	main_box.pack_start(*tag_label, false, false);
+	main_box.pack_start(tags_entry, false, false);
 	main_box.pack_start(apply_btn, false, false);
 	main_box.pack_start(bottom_box, false, false);
 
@@ -83,10 +88,10 @@ SoundFileBox::SoundFileBox ()
 	bottom_box.pack_start(play_btn);
 	bottom_box.pack_start(stop_btn);
 
-//	tags_entry.signal_focus_out_event().connect (mem_fun (*this, &SoundFileBox::tags_entry_left));
 	play_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::play_btn_clicked));
 	stop_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::stop_btn_clicked));
 	apply_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::apply_btn_clicked));
+	tags_entry.signal_activate().connect (mem_fun (*this, &SoundFileBox::apply_btn_clicked));
 
 	length.set_alignment (0.0f, 0.0f);
 	format.set_alignment (0.0f, 0.0f);
@@ -306,7 +311,8 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s)
 	found_list_view.get_selection()->signal_changed().connect(mem_fun(*this, &SoundFileBrowser::found_list_view_selected));
 	
 	found_search_btn.signal_clicked().connect(mem_fun(*this, &SoundFileBrowser::found_search_clicked));
-
+	found_entry.signal_activate().connect(mem_fun(*this, &SoundFileBrowser::found_search_clicked));
+	
 	show_all ();
 	
 	set_session (s);
@@ -386,17 +392,25 @@ SoundFileChooser::get_filename ()
 	Gtk::TreeModel::iterator iter;
 	Gtk::TreeModel::Row row;
 	
+	string filename;
 	switch (notebook.get_current_page()) {
 		case 0:
-			return chooser.get_filename();
+			filename = chooser.get_filename();
 		case 1:
 			iter = found_list_view.get_selection()->get_selected();
 			row = *iter;
-			return row[found_list_columns.pathname];
+			filename = row[found_list_columns.pathname];
 		default:
 			/* NOT REACHED */
 			return "";
 	}
+	
+	struct stat buf;
+	if (stat (filename.c_str(), &buf) || !S_ISREG(buf.st_mode)) {
+		return "";
+	}
+	
+	return filename;
 }
 
 vector<string> SoundFileOmega::mode_strings;
@@ -442,22 +456,34 @@ SoundFileOmega::get_split ()
 vector<Glib::ustring>
 SoundFileOmega::get_paths ()
 {
+	vector<Glib::ustring> results;
+	
 	int n = notebook.get_current_page ();
 	
 	if (n == 0) {
-		return chooser.get_filenames ();
-	}
-	
-	typedef Gtk::TreeView::Selection::ListHandle_Path ListPath;
-	
-	vector<Glib::ustring> results;
-	ListPath rows = found_list_view.get_selection()->get_selected_rows ();
-	for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
-		Gtk::TreeIter iter = found_list->get_iter(*i);
-		string str = (*iter)[found_list_columns.pathname];
-		results.push_back (str);
+		vector<Glib::ustring> filenames = chooser.get_filenames();
+		vector<Glib::ustring>::iterator i;
+		for (i = filenames.begin(); i != filenames.end(); ++i) {
+			struct stat buf;
+			if ((!stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) {
+				results.push_back (*i);
+			}
+		}
+		return results;
+		
+	} else {
+		
+		typedef Gtk::TreeView::Selection::ListHandle_Path ListPath;
+		
+		ListPath rows = found_list_view.get_selection()->get_selected_rows ();
+		for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
+			Gtk::TreeIter iter = found_list->get_iter(*i);
+			string str = (*iter)[found_list_columns.pathname];
+			
+			results.push_back (str);
+		}
+		return results;
 	}
-	return results;
 }
 
 void