Add remove all and disconnect all to port matrix menu. Hide bundles whose channels...

[ardour.git] / gtk2_ardour / editor_audiotrack.cc

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 693a7a6af9830f3b6bba80a3ee6ec3124c4433bb..ea703c415c8d550693e8dbe6edd14f67f6bd3d4e 100644 (file)
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #include "ardour/location.h"
 #include "ardour/audio_diskstream.h"
+#include "ardour/rc_configuration.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
@@ -33,21 +34,6 @@
 using namespace ARDOUR;
 using namespace PBD;
 
-void
-Editor::set_show_waveforms (bool yn)
-{
-       AudioTimeAxisView* atv;
-
-       if (_show_waveforms != yn) {
-               _show_waveforms = yn;
-               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-                       if ((atv = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
-                               atv->set_show_waveforms (yn);
-                       }
-               }
-       }
-}
-
 void
 Editor::set_show_waveforms_recording (bool yn)
 {
@@ -69,7 +55,7 @@ Editor::start_updating ()
        RouteTimeAxisView* rtv;
 
        //cerr << "Editor::start_updating () called" << endl;//DEBUG
-       if (is_mapped() && session) {
+       if (is_mapped() && _session) {
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
                                rtv->reset_meter ();
@@ -78,7 +64,7 @@ Editor::start_updating ()
        }
 
        if (!meters_running) {
-               fast_screen_update_connection = ARDOUR_UI::SuperRapidScreenUpdate.connect (mem_fun(*this, &Editor::fast_update_strips));
+               fast_screen_update_connection = ARDOUR_UI::SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &Editor::fast_update_strips));
                meters_running = true;
        }
     return 0;
@@ -88,11 +74,11 @@ gint
 Editor::stop_updating ()
 {
        RouteTimeAxisView* rtv;
-       
+
        meters_running = false;
        fast_screen_update_connection.disconnect();
        //cerr << "Editor::stop_updating () called" << endl;//DEBUG
-       if (is_mapped() && session) {
+       if (is_mapped() && _session) {
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
                                rtv->hide_meter ();
@@ -119,7 +105,7 @@ Editor::fast_update_strips ()
 {
        RouteTimeAxisView* rtv;
 
-       if (is_mapped() && session) {
+       if (is_mapped() && _session) {
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
                                rtv->fast_update ();