diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-13 18:05:36 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-13 18:05:36 +0000 |
commit | 1e7a2a3e661ca359af9f36c5b5b1d73f3a2a2221 (patch) | |
tree | 26e120366be5bb097ff6b9e302ced62ee55f19c4 /libs/ardour | |
parent | 35b9bf0567beb7c795f395bd0ca528812d5aa9ac (diff) |
lots more BootMessages
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3050 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/audioengine.cc | 2 | ||||
-rw-r--r-- | libs/ardour/session.cc | 17 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 7 |
3 files changed, 24 insertions, 2 deletions
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 4c2a7a2f63..dfa456cdcc 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -114,6 +114,8 @@ AudioEngine::start () if (session) { nframes_t blocksize = jack_get_buffer_size (_jack); + BootMessage (_("Connect session to engine")); + session->set_block_size (blocksize); session->set_frame_rate (jack_get_sample_rate (_jack)); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 454a710236..034f87ad4a 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -667,9 +667,13 @@ Session::when_engine_running () /* we don't want to run execute this again */ + BootMessage (_("Set block size and sample rate")); + set_block_size (_engine.frames_per_cycle()); set_frame_rate (_engine.frame_rate()); + BootMessage (_("Using configuration")); + Config->map_parameters (mem_fun (*this, &Session::config_changed)); /* every time we reconnect, recompute worst case output latencies */ @@ -725,6 +729,8 @@ Session::when_engine_running () error << _("cannot setup Click I/O") << endmsg; } + BootMessage (_("Compute I/O Latencies")); + set_worst_io_latencies (); if (_clicking) { @@ -735,6 +741,8 @@ Session::when_engine_running () to the physical outputs currently available */ + BootMessage (_("Set up standard connections")); + /* ONE: MONO */ for (uint32_t np = 0; np < n_physical_audio_outputs; ++np) { @@ -839,11 +847,15 @@ Session::when_engine_running () } add_connection (c); } + + BootMessage (_("Connect ports")); hookup_io (); /* catch up on send+insert cnts */ + BootMessage (_("Catch up with send/insert state")); + insert_cnt = 0; for (list<PortInsert*>::iterator i = _port_inserts.begin(); i != _port_inserts.end(); ++i) { @@ -871,14 +883,17 @@ Session::when_engine_running () _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty)); - /* hook us up to the engine */ + BootMessage (_("Connect to engine")); + _engine.set_session (this); #ifdef HAVE_LIBLO /* and to OSC */ + BootMessage (_("OSC startup")); + osc->set_session (*this); #endif diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 06291991d8..669145b8c4 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -335,11 +335,15 @@ Session::second_stage_init (bool new_session) return -1; } + BootMessage (_("Reset Remote Controls")); + send_full_time_code (); _engine.transport_locate (0); deliver_mmc (MIDI::MachineControl::cmdMmcReset, 0); deliver_mmc (MIDI::MachineControl::cmdLocate, 0); + BootMessage (_("Reset Control Protocols")); + ControlProtocolManager::instance().set_session (*this); if (new_session) { @@ -349,7 +353,6 @@ Session::second_stage_init (bool new_session) } _state_of_the_state = Clean; - DirtyChanged (); /* EMIT SIGNAL */ @@ -359,6 +362,8 @@ Session::second_stage_init (bool new_session) state_was_pending = false; } + BootMessage (_("Session loading complete")); + return 0; } |