smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-09 23:25:43 +01:00
Code Issues Projects Releases Wiki Activity

Remove some wrongly commited stuff. Sorry\!

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11087 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-12-27 00:57:20 +00:00
parent dfc3078013
commit 0082e3364f
6 changed files with 9 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libs/ardour/ardour/session.h
View file

@ -149,8 +149,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
const std::string& fullpath,
const std::string& snapshot_name,
BusProfile* bus_profile = 0,
std::string mix_template = "",
bool with_midi_ui = true);
std::string mix_template = "");
virtual ~Session ();
@ -1077,7 +1076,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
void auto_loop_changed (Location *);
void first_stage_init (std::string path, std::string snapshot_name);
int second_stage_init (bool with_midi_ui = true);
int second_stage_init ();
void remove_empty_sounds ();
void setup_midi_control ();

1
libs/ardour/audioengine.cc
View file

@ -91,7 +91,6 @@ AudioEngine::AudioEngine (string client_name, string session_uuid)
g_atomic_int_set (&m_meter_exit, 0);
if (connect_to_jack (client_name, session_uuid)) {
_instance = 0;
throw NoBackendAvailable ();
}

5
libs/ardour/session.cc
View file

@ -140,8 +140,7 @@ Session::Session (AudioEngine &eng,
const string& fullpath,
const string& snapshot_name,
BusProfile* bus_profile,
string mix_template,
bool with_midi_ui)
string mix_template)
: _engine (eng)
, _target_transport_speed (0.0)
, _requested_return_frame (-1)
@ -192,7 +191,7 @@ Session::Session (AudioEngine &eng,
}
}
if (second_stage_init (with_midi_ui)) {
if (second_stage_init ()) {
destroy ();
throw failed_constructor ();
}

8
libs/ardour/session_state.cc
View file

@ -293,7 +293,7 @@ Session::first_stage_init (string fullpath, string snapshot_name)
}
int
Session::second_stage_init (bool with_midi_ui)
Session::second_stage_init ()
{
AudioFileSource::set_peak_dir (_session_dir->peak_path().to_string());
@ -307,10 +307,8 @@ Session::second_stage_init (bool with_midi_ui)
return -1;
}
if (with_midi_ui) {
if (start_midi_thread ()) {
return -1;
}
if (start_midi_thread ()) {
return -1;
}
setup_midi_machine_control ();

10
libs/ardour/test/playlist_layering_test.cc
View file

@ -68,17 +68,11 @@ PlaylistLayeringTest::setUp ()
test_receiver.listen_to (fatal);
test_receiver.listen_to (warning);
AudioEngine* engine = 0;
try {
engine = new AudioEngine ("test", "");
} catch (...) {
CPPUNIT_ASSERT (false);
}
AudioEngine* engine = new AudioEngine ("test", "");
MIDI::Manager::create (engine->jack ());
CPPUNIT_ASSERT (engine->start () == 0);
_session = new Session (*engine, test_session_path, "playlist_layering_test", 0, "", false);
_session = new Session (*engine, test_session_path, "playlist_layering_test");
engine->set_session (_session);
_playlist = PlaylistFactory::create (DataType::AUDIO, *_session, "test");

2
wscript
View file

@ -310,9 +310,7 @@ def set_compiler_flags (conf,opt):
conf.env.append_value('CXXFLAGS', '-DDEBUG_RT_ALLOC')
conf.env.append_value('LINKFLAGS', '-ldl')
print 'bar'
if conf.env['DEBUG_DENORMAL_EXCEPTION']:
print 'foo'
conf.env.append_value('CFLAGS', '-DDEBUG_DENORMAL_EXCEPTION')
conf.env.append_value('CXXFLAGS', '-DDEBUG_DENORMAL_EXCEPTION')