smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 12:19:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix ardour tests to work with new AudioEngine/Backends changes

Browse source
This commit is contained in:
Tim Mayberry 2013-10-11 12:02:07 +10:00
parent 025adbe920
commit a0b9751866
7 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/test-env.sh
View file

@ -22,3 +22,4 @@ export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs
export ARDOUR_MCP_PATH="../mcp"
export ARDOUR_DLL_PATH=$libs
export ARDOUR_DATA_PATH=$top/gtk2_ardour:$top/build/gtk2_ardour:.
export ARDOUR_BACKEND_PATH=$libs/backends/jack

4
libs/ardour/test/load_session.cc
View file

@ -3,7 +3,6 @@
#include "ardour/ardour.h"
#include "ardour/audioengine.h"
#include "ardour/session.h"
#include "midi++/manager.h"
#include <iostream>
#include <cstdlib>
@ -41,9 +40,8 @@ int main (int argc, char* argv[])
AudioEngine::instance()->remove_session ();
delete s;
AudioEngine::instance()->stop (true);
AudioEngine::instance()->stop ();
MIDI::Manager::destroy ();
AudioEngine::destroy ();
return 0;

4
libs/ardour/test/profiling/load_session.cc
View file

@ -3,7 +3,6 @@
#include "ardour/ardour.h"
#include "ardour/audioengine.h"
#include "ardour/session.h"
#include "midi++/manager.h"
#include <iostream>
#include <cstdlib>
@ -41,9 +40,8 @@ int main (int argc, char* argv[])
AudioEngine::instance()->remove_session ();
delete s;
AudioEngine::instance()->stop (true);
AudioEngine::instance()->stop ();
MIDI::Manager::destroy ();
AudioEngine::destroy ();
return 0;

3
libs/ardour/test/profiling/runpc.cc
View file

@ -1,5 +1,4 @@
#include <iostream>
#include "midi++/manager.h"
#include "pbd/textreceiver.h"
#include "pbd/compose.h"
#include "pbd/enumwriter.h"
@ -31,7 +30,7 @@ main (int argc, char* argv[])
cout << "INFO: " << session->get_routes()->size() << " routes.\n";
for (int i = 0; i < 32768; ++i) {
session->process (session->engine().frames_per_cycle ());
session->process (session->engine().samples_per_cycle ());
}
return 0;

16
libs/ardour/test/session_test.cc
View file

@ -3,7 +3,7 @@
#include <glibmm/miscutils.h>
#include <stdexcept>
#include "midi++/manager.h"
#include "pbd/textreceiver.h"
#include "pbd/file_utils.h"
#include "ardour/session.h"
@ -33,17 +33,12 @@ SessionTest::setUp ()
text_receiver.listen_to (fatal);
text_receiver.listen_to (warning);
// this is not a good singleton constructor pattern
AudioEngine* engine = 0;
try {
engine = new AudioEngine ("session_test", "");
} catch (const AudioEngine::NoBackendAvailable& engine_exception) {
cerr << engine_exception.what ();
}
AudioEngine* engine = AudioEngine::create ();
CPPUNIT_ASSERT (engine);
CPPUNIT_ASSERT (engine->set_default_backend());
init_post_engine ();
CPPUNIT_ASSERT (engine->start () == 0);
@ -53,9 +48,8 @@ void
SessionTest::tearDown ()
{
// this is needed or there is a crash in MIDI::Manager::destroy
AudioEngine::instance()->stop (true);
AudioEngine::instance()->stop ();
MIDI::Manager::destroy ();
AudioEngine::destroy ();
}

4
libs/ardour/test/test_needing_session.cc
View file

@ -1,6 +1,5 @@
#include <glibmm/miscutils.h>
#include "midi++/manager.h"
#include "pbd/compose.h"
#include "pbd/enumwriter.h"
#include "ardour/session.h"
@ -26,8 +25,7 @@ TestNeedingSession::tearDown ()
{
AudioEngine::instance()->remove_session ();
delete _session;
AudioEngine::instance()->stop (true);
AudioEngine::instance()->stop ();
MIDI::Manager::destroy ();
AudioEngine::destroy ();
}

5
libs/ardour/test/test_util.cc
View file

@ -124,7 +124,10 @@ load_session (string dir, string state)
*/
Config->set_use_lxvst (false);
AudioEngine* engine = new AudioEngine ("test", "");
AudioEngine* engine = AudioEngine::create ();
CPPUNIT_ASSERT (engine->set_default_backend ());
init_post_engine ();
CPPUNIT_ASSERT (engine->start () == 0);