region list patch #2 from chris g, slightly reworked by me; sv_se po changes, possibl...

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index cf0f831fa893462f903f876bfc872a915f416158..d6ce61fc487c7cb960626c71805bcf651f60995e 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -17,7 +17,12 @@
 
 */
 
+#include <glibmm/miscutils.h>
 #include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/window_title.h>
+
+#include <pbd/enumwriter.h>
+
 #include <ardour/audioengine.h>
 
 #include "editor.h"
@@ -29,6 +34,9 @@
 
 #include "i18n.h"
 
+using namespace Gtkmm2ext;
+using namespace PBD;
+
 void
 Editor::editor_mixer_button_toggled ()
 {
@@ -39,6 +47,23 @@ Editor::editor_mixer_button_toggled ()
        }
 }
 
+void
+Editor::editor_list_button_toggled ()
+{
+       Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-list"));
+       if (act) {
+               Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
+               show_editor_list (tact->get_active());
+       }
+}
+
+void
+Editor::cms_new (boost::shared_ptr<ARDOUR::Route> r)
+{
+       current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), *session, r);
+       current_mixer_strip->GoingAway.connect (mem_fun (*this, &Editor::cms_deleted));
+}
+
 void
 Editor::cms_deleted ()
 {
@@ -65,12 +90,7 @@ Editor::show_editor_mixer (bool yn)
                                        AudioTimeAxisView* atv;
 
                                        if ((atv = dynamic_cast<AudioTimeAxisView*> (*i)) != 0) {
-                                               
-                                               current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
-                                                                                     *session,
-                                                                                     atv->route(), false);
-
-                                               current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));                                          
+                                               cms_new (atv->route ());
                                                break;
                                        }
                                }
@@ -83,11 +103,7 @@ Editor::show_editor_mixer (bool yn)
                                        AudioTimeAxisView* atv;
 
                                        if ((atv = dynamic_cast<AudioTimeAxisView*> (*i)) != 0) {
-
-                                               current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
-                                                                                     *session,
-                                                                                     atv->route(), false);
-                                               current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));                                          
+                                               cms_new (atv->route ());
                                                break;
                                        }
                                }
@@ -103,8 +119,8 @@ Editor::show_editor_mixer (bool yn)
                        current_mixer_strip->set_embedded (true);
                        current_mixer_strip->Hiding.connect (mem_fun(*this, &Editor::current_mixer_strip_hidden));
                        current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::current_mixer_strip_removed));
-                       current_mixer_strip->set_width (editor_mixer_strip_width);
-                       
+                       current_mixer_strip->set_width (editor_mixer_strip_width, (void*) this);
+
                        global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
                        global_hpacker.reorder_child (*current_mixer_strip, 0);
 
@@ -122,13 +138,23 @@ Editor::show_editor_mixer (bool yn)
        }
 }
 
+void
+Editor::show_editor_list (bool yn)
+{
+       if (yn) {
+               the_notebook.show();
+       } else {
+               the_notebook.hide();
+       }
+}
+
 void
 Editor::set_selected_mixer_strip (TimeAxisView& view)
 {
-       AudioTimeAxisView* at;
+       RouteTimeAxisView* rt;
        bool show = false;
 
-       if (!session || (at = dynamic_cast<AudioTimeAxisView*>(&view)) == 0) {
+       if (!session || (rt = dynamic_cast<RouteTimeAxisView*>(&view)) == 0) {
                return;
        }
        
@@ -136,7 +162,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 
                /* might be nothing to do */
 
-               if (current_mixer_strip->route() == at->route()) {
+               if (current_mixer_strip->route() == rt->route()) {
                        return;
                }
 
@@ -149,7 +175,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 
        current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
                                              *session,
-                                             at->route());
+                                             rt->route(), false);
        current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
        
        if (show) {
@@ -165,7 +191,7 @@ Editor::update_current_screen ()
 {
        if (session && session->engine().running()) {
 
-               nframes_t frame;
+               nframes64_t frame;
 
                frame = session->audible_frame();
 
@@ -175,9 +201,9 @@ Editor::update_current_screen ()
 
                /* only update if the playhead is on screen or we are following it */
 
-               if (_follow_playhead) {
+               if (_follow_playhead && session->requested_return_frame() < 0) {
 
-                       playhead_cursor->canvas_item.show();
+                       //playhead_cursor->canvas_item.show();
 
                        if (frame != last_update_frame) {
 
@@ -227,17 +253,16 @@ Editor::update_current_screen ()
                } else {
                        
                        if (frame != last_update_frame) {
-                               if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
-                                       playhead_cursor->canvas_item.hide();
-                               } else {
-                                       playhead_cursor->set_position (frame);
-                               }
+                               playhead_cursor->set_position (frame);
                        }
                }
 
          almost_done:
                last_update_frame = frame;
-
+#ifdef GTKOSX
+               /*XXX in a perfect world we would not have to do this. */
+               track_canvas->update_now();
+#endif
                if (current_mixer_strip) {
                        current_mixer_strip->fast_update ();
                }
@@ -279,6 +304,8 @@ Editor::current_mixer_strip_hidden ()
 void
 Editor::session_going_away ()
 {
+       _have_idled = false;
+       
        for (vector<sigc::connection>::iterator i = session_connections.begin(); i != session_connections.end(); ++i) {
                (*i).disconnect ();
        }
@@ -293,11 +320,12 @@ Editor::session_going_away ()
        clicked_crossfadeview = 0;
        entered_regionview = 0;
        entered_track = 0;
-       latest_regionview = 0;
        last_update_frame = 0;
        drag_info.item = 0;
        last_canvas_frame = 0;
 
+       playhead_cursor->canvas_item.hide ();
+
        /* hide all tracks */
 
        hide_all_tracks (false);
@@ -319,7 +347,10 @@ Editor::session_going_away ()
        named_selection_display.set_model (named_selection_model);
        edit_group_display.set_model (group_model);
 
-       edit_cursor_clock.set_session (0);
+       edit_point_clock_connection_a.disconnect();
+       edit_point_clock_connection_b.disconnect();
+
+       edit_point_clock.set_session (0);
        zoom_range_clock.set_session (0);
        nudge_clock.set_session (0);
 
@@ -327,8 +358,10 @@ Editor::session_going_away ()
 
        editor_mixer_button.set_active(false);
        editor_mixer_button.set_sensitive(false);
+       editor_list_button.set_active(false);
+       editor_list_button.set_sensitive(false);
+       
        /* clear tempo/meter rulers */
-
        remove_metric_marks ();
        hide_measures ();
        clear_marker_display ();
@@ -344,7 +377,19 @@ Editor::session_going_away ()
 
        current_mixer_strip = 0;
 
-       set_title (_("ardour: editor"));
+       WindowTitle title(Glib::get_application_name());
+       title += _("Editor");
+
+       set_title (title.get_string());
 
        session = 0;
 }
+
+void
+Editor::maybe_add_mixer_strip_width (XMLNode& node)
+{
+       if (current_mixer_strip) {
+               node.add_property ("mixer-width", enum_2_string (current_mixer_strip->get_width()));
+       }
+}
+