Some more assert() debugging

diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index f559578e4e366bc3c93978a609e2248c1c9a1d15..70943e35a308ef47a475372cb08b86d4fad821ef 100644 (file)
--- a/libs/ardour/audio_port.cc
+++ b/libs/ardour/audio_port.cc
@@ -77,6 +77,7 @@ AudioBuffer&
 AudioPort::get_audio_buffer (pframes_t nframes)
 {
        /* caller must hold process lock */
+       assert (_port_handle);
        _buffer->set_data ((Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes) +
                           _global_port_buffer_offset + _port_buffer_offset, nframes);
        return *_buffer;
@@ -86,6 +87,7 @@ Sample*
 AudioPort::engine_get_whole_audio_buffer ()
 {
        /* caller must hold process lock */
+       assert (_port_handle);
        return (Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes);
 }
 

diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc
index 91e11c8a4cde9b3b00cbc3e0f0f3f06489f104d7..8acb16dde30ea7f9247aac42958c45f36bbe0596 100644 (file)
--- a/libs/ardour/session_ltc.cc
+++ b/libs/ardour/session_ltc.cc
@@ -64,6 +64,7 @@ using namespace Timecode;
 void
 Session::ltc_tx_initialize()
 {
+       assert (!ltc_encoder && !ltc_enc_buf);
        ltc_enc_tcformat = config.get_timecode_format();
 
        ltc_tx_parse_offset();
@@ -93,11 +94,11 @@ void
 Session::ltc_tx_cleanup()
 {
        DEBUG_TRACE (DEBUG::LTC, "LTC TX cleanup\n");
+       ltc_tx_connections.drop_connections ();
        free(ltc_enc_buf);
        ltc_enc_buf = NULL;
        ltc_encoder_free(ltc_encoder);
        ltc_encoder = NULL;
-       ltc_tx_connections.drop_connections ();
 }
 
 void

diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc
index 0ef1e6332bad76cd2b9d1f1f51ed99ebc875744f..7137b1d65a4927ae9a2fb5fc79fbbb7e37a2b204 100644 (file)
--- a/libs/backends/coreaudio/coreaudio_backend.cc
+++ b/libs/backends/coreaudio/coreaudio_backend.cc
@@ -1569,7 +1569,9 @@ CoreAudioBackend::n_physical_inputs () const
 void*
 CoreAudioBackend::get_buffer (PortEngine::PortHandle port, pframes_t nframes)
 {
-       if (!port || !valid_port (port)) return NULL;
+       assert (port);
+       assert (valid_port (port));
+       if (!port || !valid_port (port)) return NULL; // XXX remove me
        return static_cast<CoreBackendPort*>(port)->get_buffer (nframes);
 }
 

diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc
index c2402a994d706e85511b18b4215d9f376f0b6a9a..d6e220cf276664da33777a5059c0cb1944e8415c 100644 (file)
--- a/libs/backends/portaudio/portaudio_backend.cc
+++ b/libs/backends/portaudio/portaudio_backend.cc
@@ -1816,7 +1816,9 @@ PortAudioBackend::n_physical_inputs () const
 void*
 PortAudioBackend::get_buffer (PortEngine::PortHandle port, pframes_t nframes)
 {
-       if (!port || !valid_port (port)) return NULL;
+       assert (port);
+       assert (valid_port (port));
+       if (!port || !valid_port (port)) return NULL; // XXX remove me
        return static_cast<PamPort*>(port)->get_buffer (nframes);
 }