Make it possible to edit multiple pan automation lines
git-svn-id: svn://localhost/ardour2/trunk@679 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
f535b0f491
commit
f0484eee89
@ -284,7 +284,7 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
|
||||
TimeAxisView* state_parent = get_parent_with_state ();
|
||||
XMLNode* xml_node = state_parent->get_child_xml_node (_state_name);
|
||||
|
||||
controls_table.show_all ();
|
||||
//controls_table.show_all ();
|
||||
|
||||
TimeAxisView::set_height (ht);
|
||||
base_rect->property_y2() = h;
|
||||
@ -297,7 +297,7 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
|
||||
(*i)->set_height ();
|
||||
}
|
||||
|
||||
switch (height) {
|
||||
switch (ht) {
|
||||
case Largest:
|
||||
xml_node->add_property ("track_height", "largest");
|
||||
controls_table.remove (name_hbox);
|
||||
@ -313,6 +313,7 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
|
||||
controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
|
||||
}
|
||||
controls_table.show_all ();
|
||||
|
||||
hide_name_entry ();
|
||||
show_name_label ();
|
||||
break;
|
||||
@ -409,7 +410,7 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
|
||||
|
||||
if (changed) {
|
||||
/* only emit the signal if the height really changed */
|
||||
route.gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
|
||||
route.gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -41,14 +41,14 @@ class AutomationTimeAxisView : public TimeAxisView {
|
||||
|
||||
~AutomationTimeAxisView();
|
||||
|
||||
void set_height (TimeAxisView::TrackHeight);
|
||||
virtual void set_height (TimeAxisView::TrackHeight);
|
||||
void set_samples_per_unit (double);
|
||||
std::string name() const { return _name; }
|
||||
|
||||
virtual void add_automation_event (ArdourCanvas::Item *item, GdkEvent *event, jack_nframes_t, double) = 0;
|
||||
|
||||
void clear_lines ();
|
||||
void add_line (AutomationLine&);
|
||||
virtual void clear_lines ();
|
||||
virtual void add_line (AutomationLine&);
|
||||
|
||||
vector<AutomationLine*> lines;
|
||||
|
||||
|
@ -39,6 +39,9 @@ PanAutomationTimeAxisView::PanAutomationTimeAxisView (Session& s, Route& r, Publ
|
||||
: AxisView (s),
|
||||
AutomationTimeAxisView (s, r, e, parent, canvas, n, X_("pan"), "")
|
||||
{
|
||||
multiline_selector.set_name ("PanAutomationLineSelector");
|
||||
|
||||
controls_table.attach (multiline_selector, 1, 5, 1, 2, Gtk::FILL | Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
|
||||
}
|
||||
|
||||
PanAutomationTimeAxisView::~PanAutomationTimeAxisView ()
|
||||
@ -53,14 +56,19 @@ PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEv
|
||||
return;
|
||||
}
|
||||
|
||||
int line_index = 0;
|
||||
|
||||
if (lines.size() > 1) {
|
||||
line_index = multiline_selector.get_active_row_number();
|
||||
|
||||
Gtkmm2ext::PopUp* msg = new Gtkmm2ext::PopUp (Gtk::WIN_POS_MOUSE, 5000, true);
|
||||
if (line_index < 0 || line_index >= (int)lines.size()) {
|
||||
Gtkmm2ext::PopUp* msg = new Gtkmm2ext::PopUp (Gtk::WIN_POS_MOUSE, 5000, true);
|
||||
|
||||
msg->set_text (_("You can't graphically edit panning of more than stream"));
|
||||
msg->touch ();
|
||||
msg->set_text (_("You need to select which line to edit"));
|
||||
msg->touch ();
|
||||
|
||||
return;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
double x = 0;
|
||||
@ -75,7 +83,7 @@ PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEv
|
||||
|
||||
lines.front()->view_to_model_y (y);
|
||||
|
||||
AutomationList& alist (lines.front()->the_list());
|
||||
AutomationList& alist (lines[line_index]->the_list());
|
||||
|
||||
_session.begin_reversible_command (_("add pan automation event"));
|
||||
_session.add_undo (alist.get_memento());
|
||||
@ -85,6 +93,49 @@ PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEv
|
||||
_session.set_dirty ();
|
||||
}
|
||||
|
||||
void
|
||||
PanAutomationTimeAxisView::clear_lines ()
|
||||
{
|
||||
AutomationTimeAxisView::clear_lines();
|
||||
multiline_selector.clear();
|
||||
}
|
||||
|
||||
void
|
||||
PanAutomationTimeAxisView::add_line (AutomationLine& line)
|
||||
{
|
||||
char buf[32];
|
||||
snprintf(buf,32,"Line %d",lines.size()+1);
|
||||
multiline_selector.append_text(buf);
|
||||
|
||||
if (lines.empty()) {
|
||||
multiline_selector.set_active(0);
|
||||
}
|
||||
|
||||
if (lines.size() + 1 > 1) {
|
||||
multiline_selector.show();
|
||||
}
|
||||
|
||||
AutomationTimeAxisView::add_line(line);
|
||||
}
|
||||
|
||||
void
|
||||
PanAutomationTimeAxisView::set_height (TimeAxisView::TrackHeight th)
|
||||
{
|
||||
AutomationTimeAxisView::set_height(th);
|
||||
|
||||
switch (th) {
|
||||
case Largest:
|
||||
case Large:
|
||||
case Larger:
|
||||
case Normal:
|
||||
multiline_selector.show();
|
||||
break;
|
||||
|
||||
default:
|
||||
multiline_selector.hide();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
PanAutomationTimeAxisView::set_automation_state (AutoState state)
|
||||
{
|
||||
|
@ -4,27 +4,36 @@
|
||||
#include "canvas.h"
|
||||
#include "automation_time_axis.h"
|
||||
|
||||
#include <gtkmm/comboboxtext.h>
|
||||
|
||||
namespace ARDOUR {
|
||||
class Redirect;
|
||||
}
|
||||
|
||||
class PanAutomationTimeAxisView : public AutomationTimeAxisView
|
||||
{
|
||||
public:
|
||||
PanAutomationTimeAxisView (ARDOUR::Session&,
|
||||
ARDOUR::Route&,
|
||||
PublicEditor&,
|
||||
TimeAxisView& parent_axis,
|
||||
ArdourCanvas::Canvas& canvas,
|
||||
std::string name);
|
||||
public:
|
||||
PanAutomationTimeAxisView (ARDOUR::Session&,
|
||||
ARDOUR::Route&,
|
||||
PublicEditor&,
|
||||
TimeAxisView& parent_axis,
|
||||
ArdourCanvas::Canvas& canvas,
|
||||
std::string name);
|
||||
|
||||
~PanAutomationTimeAxisView();
|
||||
~PanAutomationTimeAxisView();
|
||||
|
||||
void add_automation_event (ArdourCanvas::Item *item, GdkEvent *event, jack_nframes_t, double);
|
||||
void add_automation_event (ArdourCanvas::Item *item, GdkEvent *event, jack_nframes_t, double);
|
||||
|
||||
private:
|
||||
void automation_changed ();
|
||||
void set_automation_state (ARDOUR::AutoState);
|
||||
void clear_lines ();
|
||||
void add_line (AutomationLine&);
|
||||
void set_height (TimeAxisView::TrackHeight);
|
||||
|
||||
protected:
|
||||
Gtk::ComboBoxText multiline_selector;
|
||||
|
||||
private:
|
||||
void automation_changed ();
|
||||
void set_automation_state (ARDOUR::AutoState);
|
||||
};
|
||||
|
||||
#endif /* __ardour_gtk_pan_automation_time_axis_h__ */
|
||||
|
@ -882,7 +882,7 @@ TimeAxisView::reset_height()
|
||||
set_height_pixels (height);
|
||||
|
||||
for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
|
||||
(*i)->set_height ((TrackHeight)(*i)->height);
|
||||
(*i)->set_height_pixels ((TrackHeight)(*i)->height);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user