mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-10 00:34:59 +01:00
r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600
Trunk merge conflicts resolved git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
b0b7234458
commit
79986643c0
372 changed files with 20759 additions and 10250 deletions
|
|
@ -28,6 +28,7 @@
|
|||
#include "pan_automation_time_axis.h"
|
||||
#include "automation_line.h"
|
||||
#include "canvas_impl.h"
|
||||
#include "route_ui.h"
|
||||
|
||||
#include "i18n.h"
|
||||
|
||||
|
|
@ -35,11 +36,15 @@ using namespace ARDOUR;
|
|||
using namespace PBD;
|
||||
using namespace Gtk;
|
||||
|
||||
PanAutomationTimeAxisView::PanAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Canvas& canvas, std::string n)
|
||||
PanAutomationTimeAxisView::PanAutomationTimeAxisView (Session& s, boost::shared_ptr<Route> r, PublicEditor& e,
|
||||
TimeAxisView& parent, Canvas& canvas, std::string n)
|
||||
|
||||
: 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::EXPAND, Gtk::EXPAND);
|
||||
}
|
||||
|
||||
PanAutomationTimeAxisView::~PanAutomationTimeAxisView ()
|
||||
|
|
@ -54,14 +59,19 @@ PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEv
|
|||
return;
|
||||
}
|
||||
|
||||
if (lines.size() > 1) {
|
||||
int line_index = 0;
|
||||
|
||||
Gtkmm2ext::PopUp* msg = new Gtkmm2ext::PopUp (Gtk::WIN_POS_MOUSE, 5000, true);
|
||||
if (lines.size() > 1) {
|
||||
line_index = multiline_selector.get_active_row_number();
|
||||
|
||||
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 ();
|
||||
|
||||
return;
|
||||
msg->set_text (_("You need to select which line to edit"));
|
||||
msg->touch ();
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
double x = 0;
|
||||
|
|
@ -76,7 +86,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"));
|
||||
XMLNode &before = alist.get_state();
|
||||
|
|
@ -87,10 +97,57 @@ 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 %u",lines.size()+1);
|
||||
multiline_selector.append_text(buf);
|
||||
|
||||
if (lines.empty()) {
|
||||
multiline_selector.set_active(0);
|
||||
}
|
||||
|
||||
if (lines.size() + 1 > 1 && (height_style != Small && height_style != Smaller)) {
|
||||
multiline_selector.show();
|
||||
} else {
|
||||
multiline_selector.hide();
|
||||
|
||||
}
|
||||
|
||||
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:
|
||||
if (lines.size() > 1) {
|
||||
multiline_selector.show();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
multiline_selector.hide();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
PanAutomationTimeAxisView::set_automation_state (AutoState state)
|
||||
{
|
||||
if (!ignore_state_request) {
|
||||
route.panner().set_automation_state (state);
|
||||
route->panner().set_automation_state (state);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue