smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

Make the mackie surface work again by initialising control surfaces after MIDI, so that the mcu port exists when the control surface is created. In addition to this patch it is necessary to tweak the wscript to build with ALSA_MIDI.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5747 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-10-07 01:55:32 +00:00
parent c5e3ff16cb
commit 7f27d69d79
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardev_common.sh.in
View file

@ -5,7 +5,7 @@ TOP=`dirname "$0"`/..
libs=$TOP/@LIBS@
export ARDOUR_PATH=$TOP/gtk2_ardour/icons:$TOP/gtk2_ardour/pixmaps:$TOP/gtk2_ardour:$TOP/build/default/gtk2_ardour:.
export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate
export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate:$libs/surfaces/mackie
export ARDOUR_DATA_PATH=$TOP/gtk2_ardour:build/default/gtk2_ardour:.
if test -d $HOME/gtk/inst ; then

2
gtk2_ardour/ardour_ui.cc
View file

@ -336,6 +336,8 @@ ARDOUR_UI::post_engine ()
MIDI::Manager::instance()->set_api_data (engine->jack());
setup_midi ();
ARDOUR::init_post_engine ();
ActionManager::init ();
_tooltips.enable();

1
libs/ardour/ardour/ardour.h
View file

@ -46,6 +46,7 @@ namespace ARDOUR {
extern sigc::signal<void,std::string> BootMessage;
int init (bool with_vst, bool try_optimization);
void init_post_engine ();
int cleanup ();
bool no_auto_connect ();

12
libs/ardour/globals.cc
View file

@ -348,6 +348,14 @@ ARDOUR::init (bool use_vst, bool try_optimization)
/* singleton - first object is "it" */
new PluginManager ();
BoundsChanged = Change (StartChanged|PositionChanged|LengthChanged);
return 0;
}
void
ARDOUR::init_post_engine ()
{
/* singleton - first object is "it" */
new ControlProtocolManager ();
ControlProtocolManager::instance().discover_control_protocols ();
@ -356,10 +364,6 @@ ARDOUR::init (bool use_vst, bool try_optimization)
if ((node = Config->control_protocol_state()) != 0) {
ControlProtocolManager::instance().set_state (*node);
}
BoundsChanged = Change (StartChanged|PositionChanged|LengthChanged);
return 0;
}
int