Rotate output meter label. Is this really supported in the chosen gtk

[ardour.git] / gtk2_ardour / visual_time_axis.cc

diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc
index 1f2de282d384ecf406ad386a191c33dd2fb7d76e..9782a8c9f6f8e2cb6c3cf6a663f7167bddd4111f 100644 (file)
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -83,7 +83,7 @@ static const gchar* small_x_xpm[] = {
  * @param sess the current session
  * @param canvas the parent canvas object
  */
-VisualTimeAxis::VisualTimeAxis(std::string name, PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas)
+VisualTimeAxis::VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas)
        : AxisView(sess),
          TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas),
          visual_button (_("v")),
@@ -95,7 +95,6 @@ VisualTimeAxis::VisualTimeAxis(std::string name, PublicEditor& ed, ARDOUR::Sessi
        _marked_for_display = true;
        
        name_entry.signal_activate().connect(mem_fun(*this, &VisualTimeAxis::name_entry_changed)) ;
-       name_entry.signal_focus_out_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_focus_out_handler)) ;
        name_entry.signal_button_press_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_button_press_handler)) ;
        name_entry.signal_button_release_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_button_release_handler)) ;
        name_entry.signal_key_release_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_key_release_handler)) ;
@@ -142,7 +141,7 @@ VisualTimeAxis::~VisualTimeAxis()
 // Name/Id Accessors/Mutators
 
 void
-VisualTimeAxis::set_time_axis_name(std::string name, void* src)
+VisualTimeAxis::set_time_axis_name(const string & name, void* src)
 {
        std::string old_name = time_axis_name ;
        
@@ -223,7 +222,7 @@ VisualTimeAxis::visual_click()
 void
 VisualTimeAxis::hide_click()
 {
-       editor.unselect_strip_in_display (*this);
+       editor.hide_track_in_display (*this);
 }
 
 
@@ -250,15 +249,15 @@ VisualTimeAxis::choose_time_axis_color()
        bool picked ;
        Gdk::Color color ;
        gdouble current[4] ;
-       Gdk::Color* current_color ;
+       Gdk::Color current_color ;
        
        current[0] = _color.get_red() / 65535.0 ;
        current[1] = _color.get_green() / 65535.0 ;
        current[2] = _color.get_blue() / 65535.0 ;
        current[3] = 1.0 ;
 
-       current_color->set_rgb_p (current[0],current[1],current[2]);
-       color = Gtkmm2ext::UI::instance()->get_color(_("ardour: color selection"),picked, current_color) ;
+       current_color.set_rgb_p (current[0],current[1],current[2]);
+       color = Gtkmm2ext::UI::instance()->get_color(_("ardour: color selection"),picked, &current_color) ;
        
        if (picked)
        {
@@ -359,7 +358,6 @@ VisualTimeAxis::start_time_axis_rename()
        name_prompter = new ArdourPrompter() ;
 
        name_prompter->set_prompt (_("new name: ")) ;
-       ARDOUR_UI::instance()->allow_focus(true) ;
        name_prompter->show_all() ;
 
        switch (name_prompter->run ()) {
@@ -401,8 +399,6 @@ VisualTimeAxis::label_view()
 void
 VisualTimeAxis::name_entry_changed()
 {
-       ARDOUR_UI::generic_focus_out_event (0);
-
        string x = name_entry.get_text ();
        
        if (x == time_axis_name) {
@@ -439,13 +435,6 @@ VisualTimeAxis::name_entry_button_release_handler(GdkEventButton *ev)
        return FALSE;
 }
 
-gint
-VisualTimeAxis::name_entry_focus_out_handler(GdkEventFocus* ev)
-{
-       name_entry_changed();
-       return TRUE;
-}
-
 gint
 VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev)
 {