#include "automation_time_axis.h"
#include "automation_line.h"
#include "public_editor.h"
-#include "canvas-simplerect.h"
-#include "canvas-waveview.h"
+#include "simplerect.h"
#include "selection.h"
#include "ghostregion.h"
#include "rgb_macros.h"
#include "automation_selectable.h"
#include "point_selection.h"
+#include "canvas_impl.h"
+#include "utils.h"
#include "i18n.h"
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, Widget* p, std::string nom, std::string state_name, std::string nomparent)
+AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& rent,
+ ArdourCanvas::Canvas& canvas, const string & nom,
+ const string & state_name, const string & nomparent)
: AxisView (s),
- TimeAxisView (s, e, &rent, p),
+ TimeAxisView (s, e, &rent, canvas),
route (r),
_name (nom),
_state_name (state_name),
auto_play_item = 0;
ignore_state_request = false;
- base_rect = gtk_canvas_item_new (GTK_CANVAS_GROUP(canvas_display),
- gtk_canvas_simplerect_get_type(),
- "x1", 0.0,
- "y1", 0.0,
- "x2", 1000000.0,
- "outline_color_rgba", color_map[cAutomationTrackOutline],
- /* outline ends and bottom */
- "outline_what", (guint32) (0x1|0x2|0x8),
- "fill_color_rgba", color_map[cAutomationTrackFill],
- NULL);
-
- gtk_object_set_data (GTK_OBJECT(base_rect), "trackview", this);
+ // base_rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP(canvas_display),
+ // gnome_canvas_simplerect_get_type(),
+ // "x1", 0.0,
+ // "y1", 0.0,
+ // "x2", 1000000.0,
+ // "outline_color_rgba", color_map[cAutomationTrackOutline],
+ // /* outline ends and bottom */
+ // "outline_what", (guint32) (0x1|0x2|0x8),
+ // "fill_color_rgba", color_map[cAutomationTrackFill],
+ // NULL);
+ base_rect = new SimpleRect(*canvas_display);
+ base_rect->property_x1() = 0.0;
+ base_rect->property_y1() = 0.0;
+ base_rect->property_x2() = 1000000.0;
+ base_rect->property_outline_color_rgba() = color_map[cAutomationTrackOutline];
+ /* outline ends and bottom */
+ base_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);
+ base_rect->property_fill_color_rgba() = color_map[cAutomationTrackFill];
+
+ base_rect->set_data ("trackview", this);
- gtk_signal_connect (GTK_OBJECT(base_rect), "event",
- (GtkSignalFunc) PublicEditor::canvas_automation_track_event,
- this);
+ base_rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_automation_track_event),
+ base_rect, this));
- hide_button.add (*(manage (new Pixmap (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");
life easier and remove them.
*/
- name_hbox.remove (name_entry);
+ hide_name_entry();
/* move the name label over a bit */
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;
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 ();
- height_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::height_clicked));
- clear_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::clear_clicked));
- hide_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::hide_clicked));
- auto_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::auto_clicked));
+ height_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::height_clicked));
+ clear_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::clear_clicked));
+ hide_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
+ auto_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::auto_clicked));
controls_base_selected_name = X_("AutomationTrackControlsBaseSelected");
controls_base_unselected_name = X_("AutomationTrackControlsBase");
controls_ebox.set_name (controls_base_unselected_name);
- controls_frame.set_shadow_type (GTK_SHADOW_ETCHED_OUT);
+ controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
XMLNode* xml_node = get_parent_with_state()->get_child_xml_node (_state_name);
set_state (*xml_node);
automation_menu->set_name ("ArdourContextMenu");
MenuList& items (automation_menu->items());
- items.push_back (MenuElem (_("off"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
- items.push_back (MenuElem (_("play"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
- items.push_back (MenuElem (_("write"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
- items.push_back (MenuElem (_("touch"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
+ items.push_back (MenuElem (_("Manual"),
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
+ items.push_back (MenuElem (_("Play"),
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
+ items.push_back (MenuElem (_("Write"),
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
+ items.push_back (MenuElem (_("Touch"),
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
}
automation_menu->popup (1, 0);
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);
}
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);
}
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);
}
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);
}
break;
default:
- static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("???"));
+ auto_button.set_label (_("???"));
break;
}
}
}
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 ();
controls_table.show_all ();
- TimeAxisView::set_height (h);
- gtk_object_set (GTK_OBJECT(base_rect), "y2", (double) h, NULL);
+ TimeAxisView::set_height (ht);
+ base_rect->property_y2() = h;
for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
(*i)->set_height (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:
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:
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:
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:
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;
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;
hide ();
}
-
void
AutomationTimeAxisView::build_display_menu ()
{
items.push_back (MenuElem (_("Height"), *size_menu));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Hide"), slot (*this, &AutomationTimeAxisView::hide_clicked)));
+ items.push_back (MenuElem (_("Hide"), mem_fun(*this, &AutomationTimeAxisView::hide_clicked)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Clear"), slot (*this, &AutomationTimeAxisView::clear_clicked)));
+ items.push_back (MenuElem (_("Clear"), mem_fun(*this, &AutomationTimeAxisView::clear_clicked)));
items.push_back (SeparatorElem());
Menu* auto_state_menu = manage (new Menu);
auto_state_menu->set_name ("ArdourContextMenu");
MenuList& as_items = auto_state_menu->items();
- as_items.push_back (CheckMenuElem (_("off"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
- auto_off_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+ 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"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
- auto_play_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+ 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"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
- auto_write_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+ 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"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
- auto_touch_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+ 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());
items.push_back (MenuElem (_("State"), *auto_state_menu));
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)
{
AutomationTimeAxisView::add_ghost (GhostRegion* gr)
{
ghosts.push_back (gr);
- gr->GoingAway.connect (slot (*this, &AutomationTimeAxisView::remove_ghost));
+ gr->GoingAway.connect (mem_fun(*this, &AutomationTimeAxisView::remove_ghost));
}
void
if (lines.empty()) {
/* first line is the Model for automation state */
automation_connection = line.the_list().automation_state_changed.connect
- (slot (*this, &AutomationTimeAxisView::automation_state_changed));
+ (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed));
get = true;
}
projects / ardour.git / blobdiff