first vaguely working version using PresentationInfo

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index a2ded69bea8487e8db4f2b7a21f05e648b876eff..598725c72cd3ab019d192e3d4eeb7773f32e7d61 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -42,6 +42,7 @@
 
 #include "ardour/audio_track.h"
 #include "ardour/audioregion.h"
+#include "ardour/boost_debug.h"
 #include "ardour/dB.h"
 #include "ardour/location.h"
 #include "ardour/midi_region.h"
@@ -3917,6 +3918,7 @@ Editor::freeze_route ()
                gtk_main_iteration ();
        }
 
+       pthread_join (itt.thread, 0);
        current_interthread_info = 0;
 }
 
@@ -5697,11 +5699,11 @@ Editor::toggle_record_enable ()
                        continue;
 
                if (first) {
-                       new_state = !rtav->track()->record_enabled();
+                       new_state = !rtav->track()->rec_enable_control()->get_value();
                        first = false;
                }
 
-               rtav->track()->set_record_enabled (new_state, Controllable::UseGroup);
+               rtav->track()->rec_enable_control()->set_value (new_state, Controllable::UseGroup);
        }
 }
 
@@ -5710,7 +5712,7 @@ Editor::toggle_solo ()
 {
        bool new_state = false;
        bool first = true;
-       boost::shared_ptr<RouteList> rl (new RouteList);
+       boost::shared_ptr<ControlList> cl (new ControlList);
 
        for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
                RouteTimeAxisView *rtav = dynamic_cast<RouteTimeAxisView *>(*i);
@@ -5724,10 +5726,10 @@ Editor::toggle_solo ()
                        first = false;
                }
 
-               rl->push_back (rtav->route());
+               cl->push_back (rtav->route()->solo_control());
        }
 
-       _session->set_solo (rl, new_state, Session::rt_cleanup, Controllable::UseGroup);
+       _session->set_controls (cl, new_state ? 1.0 : 0.0, Controllable::UseGroup);
 }
 
 void
@@ -5752,7 +5754,7 @@ Editor::toggle_mute ()
                rl->push_back (rtav->route());
        }
 
-       _session->set_mute (rl, new_state, Session::rt_cleanup, Controllable::UseGroup);
+       _session->set_controls (route_list_to_control_list (rl, &Route::mute_control), new_state, Controllable::UseGroup);
 }
 
 void
@@ -6151,12 +6153,6 @@ Editor::split_region ()
        }
 }
 
-struct EditorOrderRouteSorter {
-    bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
-           return a->order_key () < b->order_key ();
-    }
-};
-
 void
 Editor::select_next_route()
 {
@@ -6474,11 +6470,13 @@ Editor::define_one_bar (framepos_t start, framepos_t end)
 {
        framepos_t length = end - start;
 
-       const Meter& m (_session->tempo_map().meter_at (start));
+       const Meter& m (_session->tempo_map().meter_at_frame (start));
 
        /* length = 1 bar */
 
-       /* now we want frames per beat.
+       /* We're going to deliver a constant tempo here,
+          so we can use frames per beat to determine length.
+          now we want frames per beat.
           we have frames per bar, and beats per bar, so ...
        */
 
@@ -6497,7 +6495,7 @@ Editor::define_one_bar (framepos_t start, framepos_t end)
 
        */
 
-       const TempoSection& t (_session->tempo_map().tempo_section_at (start));
+       const TempoSection& t (_session->tempo_map().tempo_section_at_frame (start));
 
        bool do_global = false;
 
@@ -6548,9 +6546,7 @@ Editor::define_one_bar (framepos_t start, framepos_t end)
        } else if (t.frame() == start) {
                _session->tempo_map().change_existing_tempo_at (start, beats_per_minute, t.note_type());
        } else {
-               Timecode::BBT_Time bbt;
-               _session->tempo_map().bbt_time (start, bbt);
-               _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), bbt);
+               _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), 0.0, start, TempoSection::Constant, AudioTime);
        }
 
        XMLNode& after (_session->tempo_map().get_state());
@@ -7098,6 +7094,7 @@ Editor::remove_tracks ()
 bool
 Editor::idle_remove_tracks ()
 {
+       Session::StateProtector sp (_session);
        _remove_tracks ();
        return false; /* do not call again */
 }
@@ -7201,12 +7198,17 @@ edit your ardour.rc file to set the\n\
        }
 
        {
-               Session::StateProtector sp (_session);
                DisplaySuspender ds;
+               boost::shared_ptr<RouteList> rl (new RouteList);
                for (vector<boost::shared_ptr<Route> >::iterator x = routes.begin(); x != routes.end(); ++x) {
-                       _session->remove_route (*x);
+                       rl->push_back (*x);
                }
+               _session->remove_routes (rl);
        }
+       /* TrackSelection and RouteList leave scope,
+        * destructors are called,
+        * diskstream drops references, save_state is called (again for every track)
+        */
 }
 
 void