mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-07 15:25:01 +01:00
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
30daaebaa2
commit
bc89fe0147
252 changed files with 28174 additions and 14382 deletions
|
|
@ -154,6 +154,7 @@ PannerUI::set_io (boost::shared_ptr<IO> io)
|
|||
panner = 0;
|
||||
}
|
||||
|
||||
setup_pan ();
|
||||
|
||||
pan_changed (0);
|
||||
update_pan_sensitive ();
|
||||
|
|
@ -225,14 +226,12 @@ PannerUI::get_controllable()
|
|||
bool
|
||||
PannerUI::panning_link_button_press (GdkEventButton* ev)
|
||||
{
|
||||
cerr << "link press\n";
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
PannerUI::panning_link_button_release (GdkEventButton* ev)
|
||||
{
|
||||
cerr << "link release\n";
|
||||
if (!ignore_toggle) {
|
||||
_io->panner().set_linked (!_io->panner().linked());
|
||||
}
|
||||
|
|
@ -259,7 +258,7 @@ PannerUI::update_pan_linkage ()
|
|||
|
||||
bool x = _io->panner().linked();
|
||||
bool bx = panning_link_button.get_active();
|
||||
|
||||
|
||||
if (x != bx) {
|
||||
|
||||
ignore_toggle = true;
|
||||
|
|
@ -328,6 +327,7 @@ PannerUI::panner_changed ()
|
|||
{
|
||||
ENSURE_GUI_THREAD (mem_fun(*this, &PannerUI::panner_changed));
|
||||
setup_pan ();
|
||||
pan_changed (0);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -573,6 +573,7 @@ PannerUI::pan_changed (void *src)
|
|||
break;
|
||||
|
||||
case 2:
|
||||
/* bring pan bar state up to date */
|
||||
update_pan_bars (false);
|
||||
break;
|
||||
|
||||
|
|
@ -806,7 +807,7 @@ PannerUI::pan_automation_state_changed ()
|
|||
pan_watching.disconnect();
|
||||
|
||||
if (x) {
|
||||
pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (*this, &PannerUI::effective_pan_display));
|
||||
pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (*this, &PannerUI::effective_pan_display));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue