diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-01-03 07:06:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-01-03 07:06:57 +0000 |
| commit | 6481d09cdc90e6bc8462b322c2c4cbecd5efc39b (patch) | |
| tree | 6a872353d3c959df9bb5e691277767f439478943 /gtk2_ardour | |
| parent | e829e4d936614a551ea492dcc2b32b9e4858084c (diff) | |
make meters work properly (and very slightly faster)
git-svn-id: svn://localhost/trunk/ardour2@230 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/editor_region_list.cc | 19 |
2 files changed, 5 insertions, 19 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index faa58359e5..052676cd4a 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -615,7 +615,6 @@ Editor::Editor (AudioEngine& eng) list<Gtk::TargetEntry> region_list_target_table; - region_list_target_table.push_back (TargetEntry ("STRING")); region_list_target_table.push_back (TargetEntry ("text/plain")); region_list_target_table.push_back (TargetEntry ("text/uri-list")); region_list_target_table.push_back (TargetEntry ("application/x-rootwin-drop")); @@ -624,7 +623,7 @@ Editor::Editor (AudioEngine& eng) region_list_display.signal_drag_data_received().connect (mem_fun(*this, &Editor::region_list_display_drag_data_received)); region_list_scroller.add (region_list_display); - region_list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + region_list_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC); region_list_display.signal_key_press_event().connect (mem_fun(*this, &Editor::region_list_display_key_press)); region_list_display.signal_key_release_event().connect (mem_fun(*this, &Editor::region_list_display_key_release)); @@ -634,7 +633,7 @@ Editor::Editor (AudioEngine& eng) // region_list_display.signal_popup_menu().connect (bind (mem_fun (*this, &Editor::show_region_list_display_context_menu), 1, 0)); named_selection_scroller.add (named_selection_display); - named_selection_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + named_selection_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC); named_selection_model = TreeStore::create (named_selection_columns); named_selection_display.set_model (named_selection_model); diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc index 3765f852bf..81070f7c63 100644 --- a/gtk2_ardour/editor_region_list.cc +++ b/gtk2_ardour/editor_region_list.cc @@ -493,7 +493,7 @@ Editor::region_list_display_button_release (GdkEventButton *ev) TreeViewColumn* column; int cellx; int celly; - Region* region; + Region* region = 0; if (region_list_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { if ((iter = region_list_model->get_iter (path))) { @@ -501,24 +501,11 @@ Editor::region_list_display_button_release (GdkEventButton *ev) } } - if (Keyboard::is_delete_event (ev)) { + if (region && Keyboard::is_delete_event (ev)) { session->remove_region_from_region_list (*region); return true; } - switch (ev->button) { - case 1: - return false; - break; - - case 3: - return false; - break; - - default: - break; - } - return false; } @@ -546,7 +533,7 @@ Editor::consider_auditioning (Region& region) int Editor::region_list_sorter (TreeModel::iterator a, TreeModel::iterator b) { - int cmp; + int cmp = 0; Region* r1 = (*a)[region_list_columns.region]; Region* r2 = (*b)[region_list_columns.region]; |