libjack: reduce debug output now that things are more stable

source/backend/engine/CarlaEngineThread.cpp

@@ -130,7 +130,7 @@ void CarlaEngineThread::run() noexcept
         carla_msleep(25);
     }
 
-    carla_stdout("CarlaEngineThread closed");
+    carla_debug("CarlaEngineThread closed");
 }
 
 // -----------------------------------------------------------------------

source/backend/plugin/CarlaPluginJack.cpp

@@ -161,10 +161,6 @@ protected:
                 carla_stdout("CarlaPluginJackThread::run() - application refused to close, force kill now");
                 fProcess->kill();
             }
-            else
-            {
-                carla_stdout("CarlaPluginJackThread::run() - application auto-closed successfully");
-            }
         }
         else
         {
@@ -178,10 +174,6 @@ protected:
                                         "Please remove this plugin, and not rely on it from this point.");
                 kEngine->callback(CarlaBackend::ENGINE_CALLBACK_ERROR, kPlugin->getId(), 0, 0, 0.0f, errorString);
             }
-            else
-            {
-                carla_stderr("CarlaPluginJackThread::run() - application closed itself");
-            }
         }
 
         fProcess = nullptr;

source/interposer/interposer-jack-x11.cpp

@@ -220,7 +220,7 @@ int XUnmapWindow(Display* display, Window window)
 CARLA_EXPORT
 int jack_carla_interposed_action(int action, void* ptr)
 {
-    carla_stdout("jack_carla_interposed_action(%i, %p)", action, ptr);
+    carla_debug("jack_carla_interposed_action(%i, %p)", action, ptr);
 
     switch (action)
     {

source/libjack/libjack.cpp

@@ -399,12 +399,11 @@ bool CarlaJackAppClient::handleRtData()
     for (; fShmRtClientControl.isDataAvailableForReading();)
     {
         const PluginBridgeRtClientOpcode opcode(fShmRtClientControl.readOpcode());
-    //#ifdef DEBUG
-        if (opcode != kPluginBridgeRtClientProcess && opcode != kPluginBridgeRtClientMidiEvent)
-        {
-            carla_stdout("CarlaJackAppClientRtThread::run() - got opcode: %s", PluginBridgeRtClientOpcode2str(opcode));
+#ifdef DEBUG
+        if (opcode != kPluginBridgeRtClientProcess && opcode != kPluginBridgeRtClientMidiEvent) {
+            carla_debug("CarlaJackAppClientRtThread::run() - got opcode: %s", PluginBridgeRtClientOpcode2str(opcode));
         }
-    //#endif
+#endif
 
         switch (opcode)
         {
@@ -762,12 +761,11 @@ bool CarlaJackAppClient::handleRtData()
             break;
         }
 
-    //#ifdef DEBUG
-        if (opcode != kPluginBridgeRtClientProcess && opcode != kPluginBridgeRtClientMidiEvent)
-        {
-            carla_stdout("CarlaJackAppClientRtThread::run() - opcode %s done", PluginBridgeRtClientOpcode2str(opcode));
+#ifdef DEBUG
+        if (opcode != kPluginBridgeRtClientProcess && opcode != kPluginBridgeRtClientMidiEvent) {
+            carla_debug("CarlaJackAppClientRtThread::run() - opcode %s done", PluginBridgeRtClientOpcode2str(opcode));
         }
-    //#endif
+#endif
     }
 
     return ret;
@@ -780,20 +778,11 @@ bool CarlaJackAppClient::handleNonRtData()
     for (; fShmNonRtClientControl.isDataAvailableForReading();)
     {
         const PluginBridgeNonRtClientOpcode opcode(fShmNonRtClientControl.readOpcode());
-
-// #ifdef DEBUG
-        if (opcode != kPluginBridgeNonRtClientPing)
-        {
-            static int shownNull = 0;
-            if (opcode == kPluginBridgeNonRtClientNull)
-            {
-                if (shownNull > 5)
-                    continue;
-                ++shownNull;
-            }
-            carla_stdout("CarlaJackAppClient::handleNonRtData() - got opcode: %s", PluginBridgeNonRtClientOpcode2str(opcode));
+#ifdef DEBUG
+        if (opcode != kPluginBridgeNonRtClientPing) {
+            carla_debug("CarlaJackAppClient::handleNonRtData() - got opcode: %s", PluginBridgeNonRtClientOpcode2str(opcode));
         }
-// #endif
+#endif
 
         if (opcode != kPluginBridgeNonRtClientNull && opcode != kPluginBridgeNonRtClientPingOnOff && fLastPingTime > 0)
             fLastPingTime = Time::currentTimeMillis();
@@ -873,17 +862,11 @@ bool CarlaJackAppClient::handleNonRtData()
             break;
         }
 
-        if (opcode != kPluginBridgeNonRtClientPing)
-        {
-            static int shownNull = 0;
-            if (opcode == kPluginBridgeNonRtClientNull)
-            {
-                if (shownNull > 5)
-                    continue;
-                ++shownNull;
-            }
-            carla_stdout("CarlaJackAppClient::handleNonRtData() - opcode %s handled", PluginBridgeNonRtClientOpcode2str(opcode));
+#ifdef DEBUG
+        if (opcode != kPluginBridgeNonRtClientPing) {
+            carla_debug("CarlaJackAppClient::handleNonRtData() - opcode %s handled", PluginBridgeNonRtClientOpcode2str(opcode));
         }
+#endif
     }
 
     return ret;
@@ -891,7 +874,7 @@ bool CarlaJackAppClient::handleNonRtData()
 
 void CarlaJackAppClient::runRealtimeThread()
 {
-    carla_stderr("CarlaJackAppClient runRealtimeThread START");
+    carla_debug("CarlaJackAppClient runRealtimeThread START");
 
 #ifdef __SSE2_MATH__
     // Set FTZ and DAZ flags
@@ -911,15 +894,13 @@ void CarlaJackAppClient::runRealtimeThread()
 
     fNonRealtimeThread.signalThreadShouldExit();
 
-    carla_stderr("CarlaJackAppClient runRealtimeThread FINISHED");
+    carla_debug("CarlaJackAppClient runRealtimeThread FINISHED");
 }
 
 void CarlaJackAppClient::runNonRealtimeThread()
 {
-    carla_stderr("CarlaJackAppClient runNonRealtimeThread START");
-
-    if (! initSharedMemmory())
-        return;
+    carla_debug("CarlaJackAppClient runNonRealtimeThread START");
+    CARLA_SAFE_ASSERT_RETURN(initSharedMemmory(),);
 
     if (fServer.numMidiIns > 0)
     {
@@ -972,22 +953,16 @@ void CarlaJackAppClient::runNonRealtimeThread()
 
     if (quitReceived)
     {
-        carla_stderr("CarlaJackAppClient runNonRealtimeThread END - quit by carla");
-
         ::kill(::getpid(), SIGTERM);
     }
     else if (timedOut)
     {
         // TODO send shutdown?
-        carla_stderr("CarlaJackAppClient runNonRealtimeThread END - timedOut");
-
+        carla_stderr("CarlaJackAppClient error: runNonRealtimeThread ended with time out");
         ::kill(::getpid(), SIGTERM);
     }
     else
     {
-        const char* const message("Plugin bridge error, process thread has stopped");
-        const std::size_t messageSize(std::strlen(message));
-
         bool activated;
 
         {
@@ -1010,7 +985,10 @@ void CarlaJackAppClient::runNonRealtimeThread()
 
         if (activated)
         {
-            carla_stderr("CarlaJackAppClient runNonRealtimeThread END - quit error");
+            carla_stderr("CarlaJackAppClient error: runNonRealtimeThread ended while client is activated");
+
+            const char* const message("Plugin bridge error, process thread has stopped");
+            const std::size_t messageSize(std::strlen(message));
 
             const CarlaMutexLocker _cml(fShmNonRtServerControl.mutex);
             fShmNonRtServerControl.writeOpcode(kPluginBridgeNonRtServerError);
@@ -1018,23 +996,6 @@ void CarlaJackAppClient::runNonRealtimeThread()
             fShmNonRtServerControl.writeCustomData(message, messageSize);
             fShmNonRtServerControl.commitWrite();
         }
-        else
-        {
-            carla_stderr("CarlaJackAppClient runNonRealtimeThread END - quit itself");
-
-            //const CarlaMutexLocker _cml(fShmNonRtServerControl.mutex);
-            //fShmNonRtServerControl.writeOpcode(kPluginBridgeNonRtServerUiClosed);
-            //fShmNonRtServerControl.commitWrite();
-        }
-
-        /*
-        if (activated)
-        {
-            // TODO infoShutdown
-            if (fClient.shutdownCb != nullptr)
-                fClient.shutdownCb(fClient.shutdownCbPtr);
-        }
-        */
     }
 
     if (fRealtimeThread.isThreadRunning())
@@ -1051,7 +1012,7 @@ void CarlaJackAppClient::runNonRealtimeThread()
 
     fRealtimeThread.stopThread(5000);
 
-    carla_stderr("CarlaJackAppClient runNonRealtimeThread FINISHED");
+    carla_debug("CarlaJackAppClient runNonRealtimeThread FINISHED");
 }
 
 // ---------------------------------------------------------------------------------------------------------------------
@@ -1068,7 +1029,7 @@ static int carla_interposed_callback(int cb_action, void* ptr)
 CARLA_EXPORT
 jack_client_t* jack_client_open(const char* client_name, jack_options_t options, jack_status_t* status, ...)
 {
-    carla_stdout("%s(%s, 0x%x, %p)", __FUNCTION__, client_name, options, status);
+    carla_debug("%s(%s, 0x%x, %p)", __FUNCTION__, client_name, options, status);
 
     if (JackClientState* const client = gClient.addClient(client_name))
         return (jack_client_t*)client;
@@ -1077,6 +1038,9 @@ jack_client_t* jack_client_open(const char* client_name, jack_options_t options,
         *status = JackServerError;
 
     return nullptr;
+
+    // unused
+    (void)options;
 }
 
 CARLA_EXPORT
@@ -1088,7 +1052,7 @@ jack_client_t* jack_client_new(const char* client_name)
 CARLA_EXPORT
 int jack_client_close(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
+    carla_debug("%s(%p)", __FUNCTION__, client);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 1);
@@ -1100,7 +1064,7 @@ int jack_client_close(jack_client_t* client)
 CARLA_EXPORT
 pthread_t jack_client_thread_id(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
+    carla_debug("%s(%p)", __FUNCTION__, client);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 0);
@@ -1126,12 +1090,15 @@ CARLA_BACKEND_USE_NAMESPACE
 CARLA_EXPORT
 int jack_client_real_time_priority(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
+    carla_debug("%s(%p)", __FUNCTION__, client);
 
     // code as used by juce
     const int minPriority = sched_get_priority_min(SCHED_RR);
     const int maxPriority = sched_get_priority_max(SCHED_RR);
     return ((maxPriority - minPriority) * 9) / 10 + minPriority;
+
+    // unused
+    (void)client;
 }
 
 typedef void (*JackSessionCallback)(jack_session_event_t*, void*);
@@ -1139,8 +1106,7 @@ typedef void (*JackSessionCallback)(jack_session_event_t*, void*);
 CARLA_EXPORT
 int jack_set_session_callback(jack_client_t* client, JackSessionCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
-
+    carla_stderr2("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
     return 0;
 }
 

source/libjack/libjack_base.cpp

@@ -27,7 +27,7 @@ void jack_get_version(int* major_ptr, int* minor_ptr, int* micro_ptr, int* proto
     *major_ptr = 1;
     *minor_ptr = 9;
     *micro_ptr = 12;
-    *proto_ptr = 1;
+    *proto_ptr = 9; // FIXME
 }
 
 CARLA_EXPORT
@@ -42,9 +42,11 @@ const char* jack_get_version_string(void)
 CARLA_EXPORT
 int jack_is_realtime(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
-
+    carla_debug("%s(%p)", __FUNCTION__, client);
     return 1;
+
+    // unused
+    (void)client;
 }
 
 // --------------------------------------------------------------------------------------------------------------------
@@ -52,8 +54,7 @@ int jack_is_realtime(jack_client_t* client)
 CARLA_EXPORT
 void jack_free(void* ptr)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, ptr);
-
+    carla_debug("%s(%p)", __FUNCTION__, ptr);
     free(ptr);
 }
 

source/libjack/libjack_callbacks.cpp

@@ -24,7 +24,7 @@ CARLA_BACKEND_USE_NAMESPACE
 CARLA_EXPORT
 int jack_set_thread_init_callback(jack_client_t* client, JackThreadInitCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
+    carla_stderr2("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
 
     return 0;
 }
@@ -32,7 +32,7 @@ int jack_set_thread_init_callback(jack_client_t* client, JackThreadInitCallback
 CARLA_EXPORT
 void jack_on_shutdown(jack_client_t* client, JackShutdownCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
+    carla_debug("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr,);
@@ -46,7 +46,7 @@ void jack_on_shutdown(jack_client_t* client, JackShutdownCallback callback, void
 CARLA_EXPORT
 void jack_on_info_shutdown(jack_client_t* client, JackInfoShutdownCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
+    carla_debug("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr,);
@@ -60,7 +60,7 @@ void jack_on_info_shutdown(jack_client_t* client, JackInfoShutdownCallback callb
 CARLA_EXPORT
 int jack_set_process_callback(jack_client_t* client, JackProcessCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
+    carla_debug("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 1);
@@ -75,7 +75,7 @@ int jack_set_process_callback(jack_client_t* client, JackProcessCallback callbac
 CARLA_EXPORT
 int jack_set_freewheel_callback(jack_client_t* client, JackFreewheelCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
+    carla_debug("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 1);
@@ -90,7 +90,7 @@ int jack_set_freewheel_callback(jack_client_t* client, JackFreewheelCallback cal
 CARLA_EXPORT
 int jack_set_buffer_size_callback(jack_client_t* client, JackBufferSizeCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
+    carla_debug("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 1);
@@ -105,7 +105,7 @@ int jack_set_buffer_size_callback(jack_client_t* client, JackBufferSizeCallback
 CARLA_EXPORT
 int jack_set_sample_rate_callback(jack_client_t* client, JackSampleRateCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
+    carla_debug("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 1);
@@ -120,48 +120,42 @@ int jack_set_sample_rate_callback(jack_client_t* client, JackSampleRateCallback
 CARLA_EXPORT
 int jack_set_client_registration_callback(jack_client_t* client, JackClientRegistrationCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
-
+    carla_stderr2("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
     return 0;
 }
 
 CARLA_EXPORT
 int jack_set_port_registration_callback(jack_client_t* client, JackPortRegistrationCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
-
+    carla_stderr2("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
     return 0;
 }
 
 CARLA_EXPORT
 int jack_set_port_connect_callback(jack_client_t* client, JackPortConnectCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
-
+    carla_stderr2("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
     return 0;
 }
 
 CARLA_EXPORT
 int jack_set_port_rename_callback(jack_client_t* client, JackPortRenameCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
-
+    carla_stderr2("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
     return 0;
 }
 
 CARLA_EXPORT
 int jack_set_graph_order_callback(jack_client_t* client, JackGraphOrderCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
-
+    carla_stderr2("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
     return 0;
 }
 
 CARLA_EXPORT
 int jack_set_xrun_callback(jack_client_t* client, JackXRunCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
-
+    carla_stderr2("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
     return 0;
 }
 

source/libjack/libjack_client.cpp

@@ -30,7 +30,7 @@ int jack_client_name_size(void)
 CARLA_EXPORT
 char* jack_get_client_name(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
+    carla_debug("%s(%p)", __FUNCTION__, client);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, nullptr);
@@ -39,14 +39,16 @@ char* jack_get_client_name(jack_client_t* client)
 }
 
 CARLA_EXPORT
-char* jack_get_uuid_for_client_name(jack_client_t*, const char*)
+char* jack_get_uuid_for_client_name(jack_client_t* client, const char* name)
 {
+    carla_stderr2("%s(%p, %s)", __FUNCTION__, client, name);
     return nullptr;
 }
 
 CARLA_EXPORT
-char* jack_get_client_name_by_uuid(jack_client_t*, const char*)
+char* jack_get_client_name_by_uuid(jack_client_t* client, const char* uuid)
 {
+    carla_stderr2("%s(%p, %s)", __FUNCTION__, client, uuid);
     return nullptr;
 }
 
@@ -55,7 +57,7 @@ char* jack_get_client_name_by_uuid(jack_client_t*, const char*)
 CARLA_EXPORT
 int jack_internal_client_new(const char*, const char*, const char*)
 {
-    return 1;
+    return ENOSYS;
 }
 
 CARLA_EXPORT
@@ -68,7 +70,7 @@ void jack_internal_client_close(const char*)
 CARLA_EXPORT
 int jack_activate(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
+    carla_debug("%s(%p)", __FUNCTION__, client);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 1);
@@ -83,7 +85,7 @@ int jack_activate(jack_client_t* client)
 CARLA_EXPORT
 int jack_deactivate(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
+    carla_debug("%s(%p)", __FUNCTION__, client);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 1);

source/libjack/libjack_error.cpp

@@ -27,7 +27,7 @@ CARLA_BACKEND_USE_NAMESPACE
 CARLA_EXPORT
 void jack_set_error_function(void (*func)(const char *))
 {
-    carla_stdout("%s(%p)", __FUNCTION__, func);
+    carla_stderr2("%s(%p)", __FUNCTION__, func);
 }
 
 //extern void (*jack_info_callback)(const char *msg) JACK_OPTIONAL_WEAK_EXPORT;
@@ -35,7 +35,7 @@ void jack_set_error_function(void (*func)(const char *))
 CARLA_EXPORT
 void jack_set_info_function(void (*func)(const char *))
 {
-    carla_stdout("%s(%p)", __FUNCTION__, func);
+    carla_stderr2("%s(%p)", __FUNCTION__, func);
 }
 
 // --------------------------------------------------------------------------------------------------------------------

source/libjack/libjack_port-searching.cpp

@@ -25,7 +25,7 @@ CARLA_BACKEND_USE_NAMESPACE
 CARLA_EXPORT
 const char** jack_get_ports(jack_client_t* client, const char* a, const char* b, unsigned long flags)
 {
-    carla_stdout("%s(%p, %s, %s, 0x%lx)", __FUNCTION__, client, a, b, flags);
+    carla_stdout("%s(%p, %s, %s, 0x%lx) WIP", __FUNCTION__, client, a, b, flags);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, nullptr);
@@ -76,7 +76,7 @@ const char** jack_get_ports(jack_client_t* client, const char* a, const char* b,
 CARLA_EXPORT
 jack_port_t* jack_port_by_name(jack_client_t* client, const char* name)
 {
-    carla_stdout("%s(%p, %s)", __FUNCTION__, client, name);
+    carla_stdout("%s(%p, %s) WIP", __FUNCTION__, client, name);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 0);
@@ -117,12 +117,12 @@ jack_port_t* jack_port_by_name(jack_client_t* client, const char* name)
         }
         else
         {
-            carla_stderr2("Invalid port short name: '%s'", name);
+            carla_stderr2("jack_port_by_name: invalid port short name '%s'", name);
             return nullptr;
         }
     }
 
-    carla_stderr2("Invalid port name: '%s'", name);
+    carla_stderr2("jack_port_by_name: invalid port name '%s'", name);
     return nullptr;
 }
 
@@ -130,7 +130,6 @@ CARLA_EXPORT
 jack_port_t* jack_port_by_id(jack_client_t* client, jack_port_id_t port_id)
 {
     carla_stderr2("%s(%p, %u)", __FUNCTION__, client, port_id);
-
     return nullptr;
 }
 

source/libjack/libjack_ports.cpp

@@ -25,7 +25,7 @@ CARLA_EXPORT
 jack_port_t* jack_port_register(jack_client_t* client, const char* port_name, const char* port_type,
                                 unsigned long flags, unsigned long buffer_size)
 {
-    carla_stdout("%s(%p, %s, %s, 0x%lx, %lu)", __FUNCTION__, client, port_name, port_type, flags, buffer_size);
+    carla_debug("%s(%p, %s, %s, 0x%lx, %lu)", __FUNCTION__, client, port_name, port_type, flags, buffer_size);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, nullptr);
@@ -61,7 +61,7 @@ jack_port_t* jack_port_register(jack_client_t* client, const char* port_name, co
             return (jack_port_t*)port;
         }
 
-        carla_stderr2("Invalid port flags '%x'", flags);
+        carla_stderr2("jack_port_register: invalid port flags '%x'", flags);
         return nullptr;
     }
 
@@ -91,18 +91,21 @@ jack_port_t* jack_port_register(jack_client_t* client, const char* port_name, co
             return (jack_port_t*)port;
         }
 
-        carla_stderr2("Invalid port flags '%x'", flags);
+        carla_stderr2("jack_port_register: invalid port flags '%x'", flags);
         return nullptr;
     }
 
-    carla_stderr2("Invalid port type '%s'", port_type);
+    carla_stderr2("jack_port_register: invalid port type '%s'", port_type);
     return nullptr;
+
+    // unused
+    (void)buffer_size;
 }
 
 CARLA_EXPORT
 int jack_port_unregister(jack_client_t* client, jack_port_t* port)
 {
-    carla_stdout("%s(%p, %p)", __FUNCTION__, client, port);
+    carla_debug("%s(%p, %p)", __FUNCTION__, client, port);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 1);
@@ -142,7 +145,7 @@ int jack_port_unregister(jack_client_t* client, jack_port_t* port)
         }
     }
 
-    carla_stderr2("Invalid port on unregister");
+    carla_stderr2("jack_port_register: invalid port '%s'", jport->name);
     return 1;
 }
 
@@ -160,15 +163,14 @@ void* jack_port_get_buffer(jack_port_t* port, jack_nframes_t)
 CARLA_EXPORT
 jack_uuid_t jack_port_uuid(const jack_port_t* port)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, port);
-
+    carla_stderr2("%s(%p)", __FUNCTION__, port);
     return 0;
 }
 
 CARLA_EXPORT
 const char* jack_port_name(const jack_port_t* port)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, port);
+    carla_debug("%s(%p)", __FUNCTION__, port);
 
     JackPortState* const jport = (JackPortState*)port;
     CARLA_SAFE_ASSERT_RETURN(jport != nullptr, nullptr);
@@ -179,7 +181,7 @@ const char* jack_port_name(const jack_port_t* port)
 CARLA_EXPORT
 const char* jack_port_short_name(const jack_port_t* port)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, port);
+    carla_debug("%s(%p)", __FUNCTION__, port);
 
     JackPortState* const jport = (JackPortState*)port;
     CARLA_SAFE_ASSERT_RETURN(jport != nullptr, nullptr);
@@ -190,7 +192,7 @@ const char* jack_port_short_name(const jack_port_t* port)
 CARLA_EXPORT
 int jack_port_flags(const jack_port_t* port)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, port);
+    carla_debug("%s(%p)", __FUNCTION__, port);
 
     JackPortState* const jport = (JackPortState*)port;
     CARLA_SAFE_ASSERT_RETURN(jport != nullptr, 0);
@@ -201,7 +203,7 @@ int jack_port_flags(const jack_port_t* port)
 CARLA_EXPORT
 const char* jack_port_type(const jack_port_t* port)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, port);
+    carla_debug("%s(%p)", __FUNCTION__, port);
 
     JackPortState* const jport = (JackPortState*)port;
     CARLA_SAFE_ASSERT_RETURN(jport != nullptr, nullptr);
@@ -215,7 +217,7 @@ const char* jack_port_type(const jack_port_t* port)
 CARLA_EXPORT
 uint32_t jack_port_type_id(const jack_port_t* port)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, port);
+    carla_debug("%s(%p)", __FUNCTION__, port);
 
     JackPortState* const jport = (JackPortState*)port;
     CARLA_SAFE_ASSERT_RETURN(jport != nullptr, 0);
@@ -247,7 +249,6 @@ CARLA_EXPORT
 int jack_port_connected_to(const jack_port_t* port, const char* port_name)
 {
     carla_stderr2("%s(%p, %s)", __FUNCTION__, port, port_name);
-
     return 1;
 }
 
@@ -257,7 +258,6 @@ CARLA_EXPORT
 const char** jack_port_get_connections (const jack_port_t* port)
 {
     carla_stderr2("%s(%p)", __FUNCTION__, port);
-
     return nullptr;
 }
 
@@ -265,7 +265,6 @@ CARLA_EXPORT
 const char** jack_port_get_all_connections(const jack_client_t* client, const jack_port_t* port)
 {
     carla_stderr2("%s(%p, %p)", __FUNCTION__, client, port);
-
     return nullptr;
 }
 
@@ -339,7 +338,6 @@ CARLA_EXPORT
 int jack_connect(jack_client_t* client, const char* a, const char* b)
 {
     carla_stderr2("%s(%p, %s. %s)", __FUNCTION__, client, a, b);
-
     return 0;
 }
 
@@ -347,7 +345,6 @@ CARLA_EXPORT
 int jack_disconnect(jack_client_t* client, const char* a, const char* b)
 {
     carla_stderr2("%s(%p, %s. %s)", __FUNCTION__, client, a, b);
-
     return 0;
 }
 
@@ -355,7 +352,6 @@ CARLA_EXPORT
 int jack_port_disconnect(jack_client_t* client, jack_port_t* port)
 {
     carla_stderr2("%s(%p, %p)", __FUNCTION__, client, port);
-
     return 0;
 }
 

source/libjack/libjack_server-control.cpp

@@ -25,7 +25,7 @@ CARLA_BACKEND_USE_NAMESPACE
 CARLA_EXPORT
 int jack_set_freewheel(jack_client_t*, int)
 {
-    return 1;
+    return ENOSYS;
 }
 
 CARLA_EXPORT
@@ -58,6 +58,7 @@ jack_nframes_t jack_get_buffer_size(jack_client_t* client)
 CARLA_EXPORT
 float jack_cpu_load(jack_client_t*)
 {
+    // TODO
     return 0.0f;
 }
 

source/libjack/libjack_stats.cpp

@@ -24,18 +24,21 @@ CARLA_BACKEND_USE_NAMESPACE
 CARLA_EXPORT
 float jack_get_max_delayed_usecs(jack_client_t*)
 {
+    // TODO
     return 0.0f;
 }
 
 CARLA_EXPORT
 float jack_get_xrun_delayed_usecs(jack_client_t*)
 {
+    // TODO
     return 0.0f;
 }
 
 CARLA_EXPORT
 void jack_reset_max_delayed_usecs(jack_client_t*)
 {
+    // TODO
 }
 
 // --------------------------------------------------------------------------------------------------------------------

source/libjack/libjack_transport.cpp

@@ -24,9 +24,11 @@ CARLA_BACKEND_USE_NAMESPACE
 CARLA_EXPORT
 int jack_engine_takeover_timebase(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
-
+    carla_debug("%s(%p)", __FUNCTION__, client);
     return ENOSYS;
+
+    // unused
+    (void)client;
 }
 
 // --------------------------------------------------------------------------------------------------------------------
@@ -34,15 +36,17 @@ int jack_engine_takeover_timebase(jack_client_t* client)
 CARLA_EXPORT
 int jack_release_timebase(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
-
+    carla_debug("%s(%p)", __FUNCTION__, client);
     return 0;
+
+    // unused
+    (void)client;
 }
 
 CARLA_EXPORT
 int jack_set_sync_callback(jack_client_t* client, JackSyncCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
+    carla_debug("%s(%p, %p, %p)", __FUNCTION__, client, callback, arg);
 
     JackClientState* const jclient = (JackClientState*)client;
     CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 1);
@@ -57,24 +61,26 @@ int jack_set_sync_callback(jack_client_t* client, JackSyncCallback callback, voi
 CARLA_EXPORT
 int jack_set_sync_timeout(jack_client_t* client, jack_time_t timeout)
 {
-    carla_stdout("%s(%p, " P_UINT64 ")", __FUNCTION__, client, timeout);
-
+    carla_stderr2("%s(%p, " P_UINT64 ")", __FUNCTION__, client, timeout);
     return 0;
 }
 
 CARLA_EXPORT
 int jack_set_timebase_callback(jack_client_t* client, int conditional, JackTimebaseCallback callback, void* arg)
 {
-    carla_stdout("%s(%p, %i, %p, %p)", __FUNCTION__, client, conditional, callback, arg);
+    carla_debug("%s(%p, %i, %p, %p)", __FUNCTION__, client, conditional, callback, arg);
+    return conditional ? EBUSY : 0;
 
-    return EBUSY;
+    // unused
+    (void)client;
+    (void)callback;
+    (void)arg;
 }
 
 CARLA_EXPORT
 int jack_transport_locate(jack_client_t* client, jack_nframes_t frame)
 {
-    carla_stdout("%s(%p, %u)", __FUNCTION__, client, frame);
-
+    carla_stderr2("%s(%p, %u)", __FUNCTION__, client, frame);
     return ENOSYS;
 }
 
@@ -109,21 +115,20 @@ jack_nframes_t jack_get_current_transport_frame(const jack_client_t* client)
 CARLA_EXPORT
 int jack_transport_reposition(jack_client_t* client, const jack_position_t* pos)
 {
-    carla_stdout("%s(%p, %p)", __FUNCTION__, client, pos);
-
+    carla_stderr2("%s(%p, %p)", __FUNCTION__, client, pos);
     return ENOSYS;
 }
 
 CARLA_EXPORT
 void jack_transport_start(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
+    carla_stderr2("%s(%p)", __FUNCTION__, client);
 }
 
 CARLA_EXPORT
 void jack_transport_stop(jack_client_t* client)
 {
-    carla_stdout("%s(%p)", __FUNCTION__, client);
+    carla_stderr2("%s(%p)", __FUNCTION__, client);
 }
 
 // --------------------------------------------------------------------------------------------------------------------
@@ -131,13 +136,13 @@ void jack_transport_stop(jack_client_t* client)
 CARLA_EXPORT
 void jack_get_transport_info(jack_client_t* client, void* tinfo)
 {
-    carla_stdout("%s(%p, %p)", __FUNCTION__, client, tinfo);
+    carla_stderr2("%s(%p, %p)", __FUNCTION__, client, tinfo);
 }
 
 CARLA_EXPORT
 void jack_set_transport_info(jack_client_t* client, void* tinfo)
 {
-    carla_stdout("%s(%p, %p)", __FUNCTION__, client, tinfo);
+    carla_stderr2("%s(%p, %p)", __FUNCTION__, client, tinfo);
 }
 
 // --------------------------------------------------------------------------------------------------------------------