fixes for crossfade views, crossfades and undo/redo. added default crossfade settings...

[ardour.git] / gtk2_ardour / location_ui.cc

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 12e7079de26358a5ec345ef05c103de50e5a2100..96ce92d42ddc9d51daf38d3374be6747ac706afd 100644 (file)
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -771,7 +771,7 @@ void
 LocationUI::add_new_location()
 {
        if (session) {
-               jack_nframes_t where = session->audible_frame();
+               nframes_t where = session->audible_frame();
                Location *location = new Location (where, where, "mark", Location::IsMark);
                session->begin_reversible_command (_("add marker"));
                XMLNode &before = session->locations()->get_state();
@@ -787,7 +787,7 @@ void
 LocationUI::add_new_range()
 {
        if (session) {
-               jack_nframes_t where = session->audible_frame();
+               nframes_t where = session->audible_frame();
                Location *location = new Location (where, where, "unnamed", 
                                                                                        Location::IsRangeMarker);
                session->begin_reversible_command (_("add range marker"));
@@ -836,7 +836,7 @@ LocationUI::set_session(ARDOUR::Session* sess)
                session->locations()->StateChanged.connect (mem_fun(*this, &LocationUI::refresh_location_list_s));
                session->locations()->added.connect (mem_fun(*this, &LocationUI::location_added));
                session->locations()->removed.connect (mem_fun(*this, &LocationUI::location_removed));
-               session->going_away.connect (mem_fun(*this, &LocationUI::session_gone));
+               session->GoingAway.connect (mem_fun(*this, &LocationUI::session_gone));
        }
        refresh_location_list ();
 }