Remove some wrongly commited stuff. Sorry\!

git-svn-id: svn://localhost/ardour2/branches/3.0@11087 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 4587c8fc68a9af1cfff5f1693f9c5b628e7905be..675950d986c4cc0192b9b8fac40236af809ef742 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -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 ();

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index a538ffcae71c62e665e6b5b0ece53c623e1b33e1..fa1d6fe175da0c224df7d6bd17d083462d82f83c 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -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 ();
        }
 

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 1c9676e578edc0cb949fd942cd00112a28934853..37349cc5fb0cc2671f2697d2d94ca6c6c3e95807 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -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 ();
        }

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index aa117f00aa6990b8a6025016252f086b0b227f98..7d6f44b7861d2566c1974b48c7e4cc76ca5ad7f0 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -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 ();

diff --git a/libs/ardour/test/playlist_layering_test.cc b/libs/ardour/test/playlist_layering_test.cc
index 05c44f5625d35a82aa2ed694cd25884683e2368d..1371b0cfaecdae9bda5b52639a0f9b48ac9cc8ed 100644 (file)
--- a/libs/ardour/test/playlist_layering_test.cc
+++ b/libs/ardour/test/playlist_layering_test.cc
@@ -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");

diff --git a/wscript b/wscript
index f8e3edccb0e3c631230eedc2e7c408a4227c4791..e797a2f3ee2ccaff5497d98737ceee434d8d9119 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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')