Remove duplicate menubarstyle property.

[ardour.git] / gtk2_ardour / editor_cursors.cc

diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 7cd13cf686fe636416d03bf1b0446d8000ab46c3..0f5c414408c31b8b1ee2293d949a10e84b56f786 100644 (file)
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -31,7 +30,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 
-Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
+Editor::Cursor::Cursor (Editor& ed, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
        : editor (ed),
          canvas_item (*editor.cursor_group),
          length(1.0)
@@ -39,11 +38,10 @@ Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)
        
        /* "randomly" initialize coords */
        
-       points.push_back(Gnome::Art::Point(-9383839.0, 0.0));
        points.push_back(Gnome::Art::Point(1.0, 0.0));
+       points.push_back(Gnome::Art::Point(1.0, 1.0));
 
        canvas_item.property_points() = points;
-       canvas_item.property_fill_color() = color; //.c_str());
        canvas_item.property_width_pixels() = 1;
        canvas_item.property_first_arrowhead() = TRUE;
        canvas_item.property_last_arrowhead() = TRUE;
@@ -53,7 +51,6 @@ Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)
 
        canvas_item.set_data ("cursor", this);
        canvas_item.signal_event().connect (bind (mem_fun (ed, callbck), &canvas_item));
-
        current_frame = 1; /* force redraw at 0 */
 }
 
@@ -63,29 +60,18 @@ Editor::Cursor::~Cursor ()
 }
 
 void
-Editor::Cursor::set_position (nframes_t frame)
+Editor::Cursor::set_position (nframes64_t frame)
 {
        double new_pos =  editor.frame_to_unit (frame);
 
-       if (editor.session == 0) {
-               canvas_item.hide();
-       } else {
-               canvas_item.show();
-       }
-
-       current_frame = frame;
-
        if (new_pos != points.front().get_x()) {
 
                points.front().set_x (new_pos);
                points.back().set_x (new_pos);
 
                canvas_item.property_points() = points;
-
-               ArdourCanvas::Points p = canvas_item.property_points();
        }
-
-       canvas_item.raise_to_top();
+       current_frame = frame;
 }
 
 void