diff options
-rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/editor_sources.cc | 18 |
2 files changed, 9 insertions, 10 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 275c461839..0d9d56db68 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -1115,7 +1115,6 @@ Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item) bool Editor::canvas_drop_zone_event (GdkEvent* event) { -printf("canvas_drop_zone_event\n"); GdkEventScroll scroll; ArdourCanvas::Duple winpos; diff --git a/gtk2_ardour/editor_sources.cc b/gtk2_ardour/editor_sources.cc index 4c9f397ace..6cc53d7238 100644 --- a/gtk2_ardour/editor_sources.cc +++ b/gtk2_ardour/editor_sources.cc @@ -95,7 +95,7 @@ EditorSources::EditorSources (Editor* e) /* column widths */ int bbt_width, date_width, height; - + Glib::RefPtr<Pango::Layout> layout = _display.create_pango_layout (X_("000|000|000")); Gtkmm2ext::get_pixel_size (layout, bbt_width, height); @@ -259,11 +259,11 @@ void EditorSources::set_session (ARDOUR::Session* s) { SessionHandlePtr::set_session (s); - + if (s) { //get all existing sources s->foreach_source (sigc::mem_fun (*this, &EditorSources::add_source)); - + //register to get new sources that are recorded/imported s->SourceAdded.connect (source_added_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::add_source, this, _1), gui_context()); s->SourceRemoved.connect (source_removed_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::remove_source, this, _1), gui_context()); @@ -271,7 +271,7 @@ EditorSources::set_session (ARDOUR::Session* s) //register for source property changes ( some things like take_id aren't immediately available at construction ) ARDOUR::Source::SourcePropertyChanged.connect (source_property_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::source_changed, this, _1), gui_context()); } else { - clear(); + clear(); } } @@ -297,7 +297,7 @@ EditorSources::populate_row (TreeModel::Row row, boost::shared_ptr<ARDOUR::Sourc if (!source) { return; } - + string str; Gdk::Color c; @@ -442,7 +442,7 @@ EditorSources::selection_changed () _change_connection.block (true); _editor->set_selected_regionview_from_region_list (*region, Selection::Add); _change_connection.block (false); - + } } } @@ -579,7 +579,7 @@ EditorSources::remove_selected_sources () _change_connection.block (true); _editor->set_selected_regionview_from_region_list (*region, Selection::Add); _change_connection.block (false); - + } } } @@ -588,7 +588,7 @@ EditorSources::remove_selected_sources () } _editor->remove_selected_regions(); - if ( opt == 2 ) { //TODO: actually delete some sources? + if ( opt == 2 ) { //TODO: actually delete some sources? } } @@ -604,7 +604,7 @@ EditorSources::key_press (GdkEventKey* ev) /* remove_selected_sources(); */ return true; //for now, just "eat" this, so Delete doesn't get propogated into the canvas, based on Source selections } - + return false; } |