new transparent-background versions of track/bus list icons from thorsten

[ardour.git] / gtk2_ardour / editor_keys.cc

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index efbe0cb522be71fa182e336d477bed3b2eb4b4ed..2da3122d48d8c324acc4b767477d97543bf20aff 100644 (file)
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 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
@@ -21,10 +21,10 @@
 #include <cmath>
 #include <string>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
-#include <ardour/session.h>
-#include <ardour/region.h>
+#include "ardour/session.h"
+#include "ardour/region.h"
 #include <gtkmm/treeview.h>
 
 #include "ardour_ui.h"
@@ -37,18 +37,17 @@
 
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
 
 void
 Editor::keyboard_selection_finish (bool add)
 {
-       if (session && have_pending_keyboard_selection) {
+       if (_session && have_pending_keyboard_selection) {
 
-               nframes64_t end;
+               framepos_t end;
                bool ignored;
 
-               if (session->transport_rolling()) {
-                       end = session->audible_frame();
+               if (_session->transport_rolling()) {
+                       end = _session->audible_frame();
                } else {
                        if (!mouse_frame (end, ignored)) {
                                return;
@@ -58,7 +57,7 @@ Editor::keyboard_selection_finish (bool add)
                if (add) {
                        selection->add (pending_keyboard_selection_start, end);
                } else {
-                       selection->set (0, pending_keyboard_selection_start, end);
+                       selection->set (pending_keyboard_selection_start, end);
                }
 
                have_pending_keyboard_selection = false;
@@ -68,19 +67,19 @@ Editor::keyboard_selection_finish (bool add)
 void
 Editor::keyboard_selection_begin ()
 {
-       if (session) {
-               if (session->transport_rolling()) {
-                       pending_keyboard_selection_start = session->audible_frame();
+       if (_session) {
+               if (_session->transport_rolling()) {
+                       pending_keyboard_selection_start = _session->audible_frame();
                        have_pending_keyboard_selection = true;
                } else {
                        bool ignored;
-                       nframes64_t where; // XXX fix me
+                       framepos_t where; // XXX fix me
 
                        if (mouse_frame (where, ignored)) {
                                pending_keyboard_selection_start = where;
                                have_pending_keyboard_selection = true;
                        }
-                               
+
                }
        }
 }
@@ -91,17 +90,3 @@ Editor::keyboard_paste ()
        ensure_entered_track_selected (true);
        paste (1);
 }
-
-void
-Editor::keyboard_insert_region_list_selection ()
-{
-       insert_region_list_selection (1);
-}
-
-int
-Editor::get_prefix (float& val, bool& was_floating)
-{
-       was_floating = false;
-       return 1;
-}
-