projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed some valgrind errors from using uninitialized variables in
[ardour.git] / gtk2_ardour / automation_time_axis.cc
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 8fe378f1b1488123dfe483e9019aca7f595034e8..670a718736e8c1dfcb7139e379d1419a5c85700a 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -11,6 +11,7 @@
 #include "automation_selectable.h"
 #include "point_selection.h"
 #include "canvas_impl.h"
+#include "utils.h"
 
 #include "i18n.h"
 
@@ -18,22 +19,6 @@ using namespace ARDOUR;
 using namespace Gtk;
 using namespace Editing;
 
-static const gchar * small_x_xpm[] = {
-"11 11 2 1",
-"      c None",
-".     c #000000",
-"           ",
-"           ",
-"  .     .  ",
-"   .   .   ",
-"    . .    ",
-"     .     ",
-"    . .    ",
-"   .   .   ",
-"  .     .  ",
-"           ",
-"           "};
-
 AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& rent, 
                                                ArdourCanvas::Canvas& canvas, const string & nom, 
                                                const string & state_name, const string & nomparent)
@@ -79,7 +64,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
        base_rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_automation_track_event),
                                                 base_rect, this));
 
-       hide_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(small_x_xpm)))));
+       hide_button.add (*(manage (new Gtk::Image (get_xpm("small_x.xpm")))));
 
        height_button.set_name ("TrackSizeButton");
        auto_button.set_name ("TrackVisualButton");
@@ -97,7 +82,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
           life easier and remove them.
        */
 
-       name_hbox.remove (name_entry);
+       hide_name_entry();
 
        /* move the name label over a bit */
 
@@ -131,9 +116,9 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
                plugname->set_alignment (1.0, 0.5);
                name_label.set_name (X_("TrackParameterName"));
                controls_table.remove (name_hbox);
-               controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                plugname_packed = true;
-               controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
        } else {
                plugname = 0;
                plugname_packed = false;
@@ -152,8 +137,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
        controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
        controls_table.attach (height_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 
-       controls_table.attach (auto_button, 7, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (clear_button, 7, 9, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       controls_table.attach (auto_button, 6, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       controls_table.attach (clear_button, 6, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
        
        controls_table.show_all ();
 
@@ -195,13 +180,13 @@ AutomationTimeAxisView::auto_clicked ()
                automation_menu->set_name ("ArdourContextMenu");
                MenuList& items (automation_menu->items());
 
-               items.push_back (MenuElem (_("off"), 
+               items.push_back (MenuElem (_("Manual"), 
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
-               items.push_back (MenuElem (_("play"),
+               items.push_back (MenuElem (_("Play"),
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
-               items.push_back (MenuElem (_("write"),
+               items.push_back (MenuElem (_("Write"),
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
-               items.push_back (MenuElem (_("touch"),
+               items.push_back (MenuElem (_("Touch"),
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
        }
 
@@ -224,7 +209,7 @@ AutomationTimeAxisView::automation_state_changed ()
 
        switch (state & (Off|Play|Touch|Write)) {
        case Off:
-               static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("off"));
+               auto_button.set_label (_("Manual"));
                if (auto_off_item) {
                        ignore_state_request = true;
                        auto_off_item->set_active (true);
@@ -235,7 +220,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Play:
-               static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("play"));
+               auto_button.set_label (_("Play"));
                if (auto_play_item) {
                        ignore_state_request = true;
                        auto_play_item->set_active (true);
@@ -246,7 +231,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Write:
-               static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("write"));
+               auto_button.set_label (_("Write"));
                if (auto_write_item) {
                        ignore_state_request = true;
                        auto_write_item->set_active (true);
@@ -257,7 +242,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Touch:
-               static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("touch"));
+               auto_button.set_label (_("Touch"));
                if (auto_touch_item) {
                        ignore_state_request = true;
                        auto_touch_item->set_active (true);
@@ -268,7 +253,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        default:
-               static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("???"));
+               auto_button.set_label (_("???"));
                break;
        }
 }
@@ -290,8 +275,9 @@ AutomationTimeAxisView::clear_clicked ()
 }
 
 void
-AutomationTimeAxisView::set_height (TrackHeight h)
+AutomationTimeAxisView::set_height (TrackHeight ht)
 {
+       uint32_t h = height_to_pixels (ht);
        bool changed = (height != (uint32_t) h);
 
        TimeAxisView* state_parent = get_parent_with_state ();
@@ -299,7 +285,7 @@ AutomationTimeAxisView::set_height (TrackHeight h)
 
        controls_table.show_all ();
 
-       TimeAxisView::set_height (h);
+       TimeAxisView::set_height (ht);
        base_rect->property_y2() = h;
 
        for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
@@ -319,14 +305,15 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                controls_table.remove (*plugname);
                                plugname_packed = false;
                        }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+                       controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                        plugname_packed = true;
-                       controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+                       controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+                       controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                }
                controls_table.show_all ();
-               name_label.show ();
+               hide_name_entry ();
+               show_name_label ();
                break;
 
        case Large:
@@ -337,13 +324,14 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                controls_table.remove (*plugname);
                                plugname_packed = false;
                        }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+                       controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                        plugname_packed = true;
                } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+                       controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                }
                controls_table.show_all ();
-               name_label.show ();
+               hide_name_entry ();
+               show_name_label ();
                break;
 
        case Larger:
@@ -354,13 +342,14 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                controls_table.remove (*plugname);
                                plugname_packed = false;
                        }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+                       controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                        plugname_packed = true;
                } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+                       controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                }
                controls_table.show_all ();
-               name_label.show ();
+               hide_name_entry ();
+               show_name_label ();
                break;
 
        case Normal:
@@ -371,14 +360,15 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                controls_table.remove (*plugname);
                                plugname_packed = false;
                        }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+                       controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                        plugname_packed = true;
-                       controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+                       controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+                       controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                }
                controls_table.show_all ();
-               name_label.show ();
+               hide_name_entry ();
+               show_name_label ();
                break;
 
        case Smaller:
@@ -390,8 +380,10 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                plugname_packed = false;
                        }
                }
-               controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                controls_table.hide_all ();
+               hide_name_entry ();
+               show_name_label ();
                name_hbox.show_all ();
                controls_table.show ();
                break;
@@ -405,8 +397,10 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                plugname_packed = false;
                        }
                } 
-               controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                controls_table.hide_all ();
+               hide_name_entry ();
+               show_name_label ();
                name_hbox.show_all ();
                controls_table.show ();
                break;
@@ -435,7 +429,6 @@ AutomationTimeAxisView::hide_clicked ()
        hide ();
 }
 
-
 void
 AutomationTimeAxisView::build_display_menu ()
 {
@@ -464,19 +457,19 @@ AutomationTimeAxisView::build_display_menu ()
        auto_state_menu->set_name ("ArdourContextMenu");
        MenuList& as_items = auto_state_menu->items();
        
-       as_items.push_back (CheckMenuElem (_("off"), 
+       as_items.push_back (CheckMenuElem (_("Manual"), 
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
        auto_off_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
-       as_items.push_back (CheckMenuElem (_("play"),
+       as_items.push_back (CheckMenuElem (_("Play"),
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
        auto_play_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
-       as_items.push_back (CheckMenuElem (_("write"),
+       as_items.push_back (CheckMenuElem (_("Write"),
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
        auto_write_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
-       as_items.push_back (CheckMenuElem (_("touch"),
+       as_items.push_back (CheckMenuElem (_("Touch"),
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
        auto_touch_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
@@ -543,6 +536,31 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
        return ret;
 }
 
+void
+AutomationTimeAxisView::reset_objects (PointSelection& selection)
+{
+       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
+               reset_objects_one ((**i), selection);
+       }
+}
+
+void
+AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection& selection)
+{
+       AutomationList& alist (line.the_list());
+
+       _session.add_undo (alist.get_memento());
+
+       for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) {
+
+               if (&(*i).track != this) {
+                       continue;
+               }
+               
+               alist.reset_range ((*i).start, (*i).end);
+       }
+}
+
 bool
 AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp op)
 {
Unnamed repository; edit this file 'description' to name the repository.