Changeset 3917

Timestamp:

02/18/10 01:08:09 (5 months ago)

Author:

sletz

Message:

rebase from trunk 3899:3916

Files:

• jack2/branches/libjacknet/ChangeLog (modified) (1 diff)
• jack2/branches/libjacknet/common/jack/types.h (modified) (1 diff)
• jack2/branches/libjacknet/common/jack/weakmacros.h (modified) (2 diffs)
• jack2/branches/libjacknet/common/JackAudioDriver.cpp (modified) (3 diffs)
• jack2/branches/libjacknet/common/JackClient.cpp (modified) (1 diff)
• jack2/branches/libjacknet/common/JackConstants.h (modified) (1 diff)
• jack2/branches/libjacknet/common/JackDriver.h (modified) (1 diff)
• jack2/branches/libjacknet/common/JackEngine.cpp (modified) (19 diffs)
• jack2/branches/libjacknet/common/JackEngine.h (modified) (3 diffs)
• jack2/branches/libjacknet/common/JackEngineControl.cpp (modified) (1 diff)
• jack2/branches/libjacknet/common/JackEngineControl.h (modified) (1 diff)
• jack2/branches/libjacknet/common/JackGraphManager.cpp (modified) (1 diff)
• jack2/branches/libjacknet/common/JackGraphManager.h (modified) (2 diffs)
• jack2/branches/libjacknet/common/JackLockedEngine.h (modified) (27 diffs)
• jack2/branches/libjacknet/common/JackMidiDriver.cpp (modified) (3 diffs)
• jack2/branches/libjacknet/common/JackMutex.h (modified) (1 diff)
• jack2/branches/libjacknet/common/JackNetOneDriver.cpp (modified) (4 diffs)
• jack2/branches/libjacknet/doxyfile (modified) (1 diff)
• jack2/branches/libjacknet/example-clients/lsp.c (modified) (1 diff)
• jack2/branches/libjacknet/linux/alsa/alsa_rawmidi.c (modified) (1 diff)
• jack2/branches/libjacknet/linux/alsa/alsa_seqmidi.c (modified) (1 diff)
• jack2/branches/libjacknet/linux/alsa/JackAlsaDriver.cpp (modified) (3 diffs)
• jack2/branches/libjacknet/linux/firewire/JackFFADODriver.cpp (modified) (8 diffs)
• jack2/branches/libjacknet/linux/freebob/JackFreebobDriver.cpp (modified) (5 diffs)
• jack2/branches/libjacknet/macosx/coreaudio/JackCoreAudioDriver.cpp (modified) (5 diffs)
• jack2/branches/libjacknet/macosx/coremidi/JackCoreMidiDriver.cpp (modified) (4 diffs)
• jack2/branches/libjacknet/macosx/Jack-Info.plist (modified) (2 diffs)
• jack2/branches/libjacknet/macosx/Jackdmp.xcodeproj/project.pbxproj (modified) (9 diffs)
• jack2/branches/libjacknet/posix/JackNetUnixSocket.cpp (modified) (1 diff)
• jack2/branches/libjacknet/posix/JackPosixMutex.h (modified) (2 diffs)
• jack2/branches/libjacknet/README (modified) (1 diff)
• jack2/branches/libjacknet/tests/test.cpp (modified) (6 diffs)
• jack2/branches/libjacknet/windows/jackaudioadapter.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/jackd.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/jacknetadapter.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/jacknetdriver.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/jacknetmanager.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/jackportaudio.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/JackRouter/resource.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/jackwinmme.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/JackWinMutex.h (modified) (3 diffs)
• jack2/branches/libjacknet/windows/libjack.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/libjackserver.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/resource.rc (modified) (2 diffs)
• jack2/branches/libjacknet/windows/Setup/jack.ci (modified) (2 diffs)
• jack2/branches/libjacknet/windows/Setup/JackRouter.dll (modified) (previous)
• jack2/branches/libjacknet/windows/winmme/JackWinMMEDriver.cpp (modified) (4 diffs)
• jack2/branches/libjacknet/wscript (modified) (1 diff)

jack2/branches/libjacknet/ChangeLog

@@ -30 +30 @@
----------------------------
-
+2010-02-15 Gabriel M. Beddingfield <gabriel@teuton.org>
+
+        * Version 1.9.6 started.
+
-2010-01-29 Gabriel M. Beddingfield <gabriel@teuton.org>
-

jack2/branches/libjacknet/common/jack/types.h

@@ -296 +296 @@
-     * their ports.
-     */
-
+
+
+
+
+
+
+
+
+
-};
-

jack2/branches/libjacknet/common/jack/weakmacros.h

@@ -44 +44 @@
-#else
-/* Add other things here for non-gcc platforms */
+#define JACK_WEAK_EXPORT
-#endif
-#endif
@@ -56 +57 @@
-#else
-/* Add other things here for non-gcc platforms */
+#define  JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT
-#endif /* __GNUC__ */
-#endif

jack2/branches/libjacknet/common/JackAudioDriver.cpp

@@ -102 +102 @@
-    char name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-    char alias[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-    unsigned long port_flags = JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal;
-    int i;
-
@@ -110 +109 @@
-        snprintf(alias, sizeof(alias) - 1, "%s:%s:out%d", fAliasName, fCaptureDriverName, i + 1);
-        snprintf(name, sizeof(name) - 1, "%s:capture_%d", fClientControl.fName, i + 1);
-(JackPortFlags)port_f
+CaptureDriverF
-            jack_error("driver: cannot register port for %s", name);
-            return -1;
@@ -121 +120 @@
-    }
-
-    port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal;
-
-    for (i = 0; i < fPlaybackChannels; i++) {
-        snprintf(alias, sizeof(alias) - 1, "%s:%s:in%d", fAliasName, fPlaybackDriverName, i + 1);
-        snprintf(name, sizeof(name) - 1, "%s:playback_%d", fClientControl.fName, i + 1);
-(JackPortFlags)port_f
+PlaybackDriverF
-            jack_error("driver: cannot register port for %s", name);
-            return -1;

jack2/branches/libjacknet/common/JackClient.cpp

@@ -253 +253 @@
-                
-             case kPortRenameCallback:
-
+, value1
-                if (fPortRename) {
-                    fPortRename(value1, message, GetGraphManager()->GetPort(value1)->GetName(), fPortRenameArg);

jack2/branches/libjacknet/common/JackConstants.h

@@ -25 +25 @@
-#endif
-
-5
+6
-
-#define BUFFER_SIZE_MAX 8192

jack2/branches/libjacknet/common/JackDriver.h

@@ -110 +110 @@
- \brief The base class for drivers.
- */
+ 
+#define CaptureDriverFlags  static_cast<JackPortFlags>(JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal | JackPortIsActive)
+#define PlaybackDriverFlags static_cast<JackPortFlags>(JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal | JackPortIsActive)
+#define MonitorDriverFlags static_cast<JackPortFlags>(JackPortIsOutput | JackPortIsActive)
-
-class SERVER_EXPORT JackDriver : public JackDriverClientInterface

jack2/branches/libjacknet/common/JackEngine.cpp

@@ -35 +35 @@
-namespace Jack
-{
-
-#define AssertRefnum(ref) assert(ref >= 0 && ref < CLIENT_NUM);
-
-JackEngine::JackEngine(JackGraphManager* manager,
@@ -214 +212 @@
-
-    // The client may be notified by the RT thread while closing
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    for (int i = 0; i < CLIENT_NUM; i++) {
-
-
-
-
-
-
-
-
-
+
-    }
-}
@@ -275 +273 @@
-{
-    // Use the audio thread => request thread communication channel
-
-
+
-    fChannel.Notify(ALL_CLIENTS, kXRunCallback, 0);
-}
@@ -349 +346 @@
-int JackEngine::GetInternalClientName(int refnum, char* name_res)
-{
-    AssertRefnum(refnum);
-    JackClientInterface* client = fClientTable[refnum];
-
-
-
-
-
-
+
+
-}
-
@@ -379 +371 @@
-int JackEngine::InternalClientUnload(int refnum, int* status)
-{
-    AssertRefnum(refnum);
-    JackClientInterface* client = fClientTable[refnum];
-    if (client) {
@@ -593 +584 @@
-int JackEngine::ClientExternalClose(int refnum)
-{
-    AssertRefnum(refnum);
-    JackClientInterface* client = fClientTable[refnum];
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
@@ -610 +595 @@
-int JackEngine::ClientInternalClose(int refnum, bool wait)
-{
-    AssertRefnum(refnum);
-    JackClientInterface* client = fClientTable[refnum];
-(client)    ? ClientCloseAux(refnum, client, wait) : -1
+ClientCloseAux(refnum, client, wait)
-}
-
@@ -657 +641 @@
-int JackEngine::ClientActivate(int refnum, bool is_real_time)
-{
-    AssertRefnum(refnum);
-    JackClientInterface* client = fClientTable[refnum];
-    assert(fClientTable[refnum]);
-
-    jack_log("JackEngine::ClientActivate ref = %ld name = %s", refnum, client->GetClientControl()->fName);
+    
-    if (is_real_time)
-        fGraphManager->Activate(refnum);
@@ -670 +652 @@
-        return -1;
-    } else {
+        jack_int_t input_ports[PORT_NUM_FOR_CLIENT];
+        jack_int_t output_ports[PORT_NUM_FOR_CLIENT];
+        fGraphManager->GetInputPorts(refnum, input_ports);
+        fGraphManager->GetOutputPorts(refnum, output_ports);
+        
+        // First add port state to JackPortIsActive
+        for (int i = 0; (i < PORT_NUM_FOR_CLIENT) && (input_ports[i] != EMPTY); i++) {
+            fGraphManager->ActivatePort(input_ports[i]);
+        }
+        for (int i = 0; (i < PORT_NUM_FOR_CLIENT) && (output_ports[i] != EMPTY); i++) {
+            fGraphManager->ActivatePort(output_ports[i]);
+        }
+        
+        // Notify client
-        NotifyActivate(refnum);
+        
+        // Then issue port registration notification
+        for (int i = 0; (i < PORT_NUM_FOR_CLIENT) && (input_ports[i] != EMPTY); i++) {
+            NotifyPortRegistation(input_ports[i], true);
+        }
+        for (int i = 0; (i < PORT_NUM_FOR_CLIENT) && (output_ports[i] != EMPTY); i++) {
+            NotifyPortRegistation(output_ports[i], true);
+        }
+
-        return 0;
-    }
@@ -678 +683 @@
-int JackEngine::ClientDeactivate(int refnum)
-{
-    AssertRefnum(refnum);
-    JackClientInterface* client = fClientTable[refnum];
-    if (client == NULL)
-        return -1;
-
-    jack_log("JackEngine::ClientDeactivate ref = %ld name = %s", refnum, client->GetClientControl()->fName);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -718 +728 @@
-{
-    jack_log("JackEngine::PortRegister ref = %ld name = %s type = %s flags = %d buffer_size = %d", refnum, name, type, flags, buffer_size);
-
-
+
-
-    // Check if port name already exists
@@ -729 +738 @@
-    *port_index = fGraphManager->AllocatePort(refnum, name, type, (JackPortFlags)flags, fEngineControl->fBufferSize);
-    if (*port_index != NO_PORT) {
-
+
+
-        return 0;
-    } else {
@@ -739 +749 @@
-{
-    jack_log("JackEngine::PortUnRegister ref = %ld port_index = %ld", refnum, port_index);
-
-
+
-
-    // Disconnect port ==> notification is sent
@@ -746 +755 @@
-
-    if (fGraphManager->ReleasePort(refnum, port_index) == 0) {
-
+
+
-        return 0;
-    } else {
@@ -756 +766 @@
-{
-    jack_log("JackEngine::PortConnect src = %s dst = %s", src, dst);
-    AssertRefnum(refnum);
-    jack_port_id_t port_src, port_dst;
-
@@ -767 +776 @@
-{
-    jack_log("JackEngine::PortConnect src = %d dst = %d", src, dst);
-    AssertRefnum(refnum);
-    JackClientInterface* client;
-    int ref;
@@ -803 +811 @@
-{
-    jack_log("JackEngine::PortDisconnect src = %s dst = %s", src, dst);
-    AssertRefnum(refnum);
-    jack_port_id_t port_src, port_dst;
-
@@ -814 +821 @@
-{
-    jack_log("JackEngine::PortDisconnect src = %d dst = %d", src, dst);
-
-
+
-    if (dst == ALL_PORTS) {
-
@@ -851 +857 @@
-int JackEngine::PortRename(int refnum, jack_port_id_t port, const char* name)
-{
-    AssertRefnum(refnum);
-    char old_name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-    strcpy(old_name, fGraphManager->GetPort(port)->GetName());

jack2/branches/libjacknet/common/JackEngine.h

@@ -24 +24 @@
-#include "JackGraphManager.h"
-#include "JackSynchro.h"
+#include "JackMutex.h"
-#include "JackTransportEngine.h"
-#include "JackPlatformPlug.h"
@@ -38 +39 @@
-*/
-
-
+: public JackLockAble
-{
+    friend class JackLockedEngine;
+    
-    private:
-
@@ -72 +75 @@
-        void NotifyPortRename(jack_port_id_t src, const char* old_name);
-        void NotifyActivate(int refnum);
+        
+        bool CheckClient(int refnum)
+        {
+            return (refnum >= 0 && refnum < CLIENT_NUM && fClientTable[refnum] != NULL);
+        }
-
-    public:

jack2/branches/libjacknet/common/JackEngineControl.cpp

@@ -82 +82 @@
-}
-    
-
+jack_time_t callback_usecs, 
-{
+    ResetFrameTime(callback_usecs);
-    fXrunDelayedUsecs = delayed_usecs;
-    if (delayed_usecs > fMaxDelayedUsecs)

jack2/branches/libjacknet/common/JackEngineControl.h

@@ -163 +163 @@
-    
-    // XRun
-
+jack_time_t callback_usecs, 
-    void ResetXRun()
-    {

jack2/branches/libjacknet/common/JackGraphManager.cpp

@@ -377 +377 @@
-}
-
+void JackGraphManager::ActivatePort(jack_port_id_t port_index)
+{
+    JackPort* port = GetPort(port_index);
+    port->fFlags = (JackPortFlags)(port->fFlags | JackPortIsActive);
+}
+
+void JackGraphManager::DeactivatePort(jack_port_id_t port_index)
+{
+    JackPort* port = GetPort(port_index);
+    port->fFlags = (JackPortFlags)(port->fFlags | ~JackPortIsActive);
+}
+
-void JackGraphManager::GetInputPorts(int refnum, jack_int_t* res)
-{

jack2/branches/libjacknet/common/JackGraphManager.h

@@ -66 +66 @@
-        jack_port_id_t AllocatePort(int refnum, const char* port_name, const char* port_type, JackPortFlags flags, jack_nframes_t buffer_size);
-        int ReleasePort(int refnum, jack_port_id_t port_index);
+        void ActivatePort(jack_port_id_t port_index);
+        void DeactivatePort(jack_port_id_t port_index);
-        void GetInputPorts(int refnum, jack_int_t* res);
-        void GetOutputPorts(int refnum, jack_int_t* res);
@@ -76 +78 @@
-        int ComputeTotalLatencies();
-        int RequestMonitor(jack_port_id_t port_index, bool onoff);
-
+
-        // Connections management
-        int Connect(jack_port_id_t src_index, jack_port_id_t dst_index);

jack2/branches/libjacknet/common/JackLockedEngine.h

@@ -38 +38 @@
-    // Assuming thread cancellation, must rethrow
-    throw;
-    
-}
-*/
@@ -63 +62 @@
-    }                                               \
-
+
-/*!
-\brief Locked Engine, access to methods is serialized using a mutex.
-*/
-
-: public JackLockAble
+
-{
-    private:
@@ -100 +100 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            return fEngine.ClientCheck(name, name_res, protocol, options, status);
-            CATCH_EXCEPTION_RETURN
@@ -107 +107 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            return fEngine.ClientExternalOpen(name, pid, ref, shared_engine, shared_client, shared_graph_manager);
-            CATCH_EXCEPTION_RETURN
@@ -114 +114 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            return fEngine.ClientInternalOpen(name, ref, shared_engine, shared_manager, client, wait);
-            CATCH_EXCEPTION_RETURN
@@ -122 +122 @@
-        {
-            TRY_CALL
-this
-fEngine.ClientExternalClose(refnum)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.ClientExternalClose(refnum) : - 1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -129 +129 @@
-        {
-            TRY_CALL
-this
-fEngine.ClientInternalClose(refnum, wait)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.ClientInternalClose(refnum, wait) : -1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -137 +137 @@
-        {
-            TRY_CALL
-this
-fEngine.ClientActivate(refnum, is_real_time)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.ClientActivate(refnum, is_real_time) : -1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -144 +144 @@
-        {
-            TRY_CALL
-this
-fEngine.ClientDeactivate(refnum)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.ClientDeactivate(refnum) : -1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -153 +153 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            return fEngine.GetInternalClientName(int_ref, name_res);
-            CATCH_EXCEPTION_RETURN
@@ -160 +160 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            return fEngine.InternalClientHandle(client_name, status, int_ref);
-            CATCH_EXCEPTION_RETURN
@@ -167 +167 @@
-        {
-            TRY_CALL
-
+
+
-            return fEngine.InternalClientUnload(refnum, status);
-            CATCH_EXCEPTION_RETURN
@@ -176 +177 @@
-        {
-            TRY_CALL
-this
-fEngine.PortRegister(refnum, name, type, flags, buffer_size, port)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.PortRegister(refnum, name, type, flags, buffer_size, port) : -1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -183 +184 @@
-        {
-            TRY_CALL
-this
-fEngine.PortUnRegister(refnum, port)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.PortUnRegister(refnum, port) : -1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -191 +192 @@
-        {
-            TRY_CALL
-this
-fEngine.PortConnect(refnum, src, dst)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.PortConnect(refnum, src, dst) : -1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -198 +199 @@
-        {
-            TRY_CALL
-this
-fEngine.PortDisconnect(refnum, src, dst)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.PortDisconnect(refnum, src, dst) : -1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -206 +207 @@
-        {
-            TRY_CALL
-this
-fEngine.PortConnect(refnum, src, dst)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.PortConnect(refnum, src, dst) : -1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -213 +214 @@
-        {
-            TRY_CALL
-this
-fEngine.PortDisconnect(refnum, src, dst)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.PortDisconnect(refnum, src, dst) : -1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -221 +222 @@
-        {
-            TRY_CALL
-this
-fEngine.PortRename(refnum, port, name)
+&fEngine
+(fEngine.CheckClient(refnum)) ? fEngine.PortRename(refnum, port, name) : -1
-            CATCH_EXCEPTION_RETURN
-        }
@@ -242 +243 @@
-        void NotifyXRun(int refnum)
-        {
-
-
+
-            fEngine.NotifyXRun(refnum);
-    CATCH_EXCEPTION
-}
+}
+
-        void NotifyGraphReorder()
-        {
-            TRY_CALL
-this
+&fEngine
-            fEngine.NotifyGraphReorder();
-            CATCH_EXCEPTION
@@ -257 +257 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            fEngine.NotifyBufferSize(buffer_size);
-            CATCH_EXCEPTION
@@ -264 +264 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            fEngine.NotifySampleRate(sample_rate);
-            CATCH_EXCEPTION
@@ -271 +271 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            fEngine.NotifyFreewheel(onoff);
-            CATCH_EXCEPTION
@@ -279 +279 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            fEngine.NotifyFailure(code, reason);
-            CATCH_EXCEPTION
@@ -287 +287 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            return fEngine.GetClientPID(name);
-            CATCH_EXCEPTION_RETURN
@@ -295 +295 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            return fEngine.GetClientRefNum(name);
-            CATCH_EXCEPTION_RETURN
@@ -303 +303 @@
-        {
-            TRY_CALL
-this
+&fEngine
-            return fEngine.NotifyQuit();
-            CATCH_EXCEPTION

jack2/branches/libjacknet/common/JackMidiDriver.cpp

@@ -75 +75 @@
-    char name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-    char alias[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-    unsigned long port_flags = JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal;
-    int i;
-
@@ -83 +82 @@
-        snprintf(alias, sizeof(alias) - 1, "%s:%s:out%d", fAliasName, fCaptureDriverName, i + 1);
-        snprintf(name, sizeof(name) - 1, "%s:capture_%d", fClientControl.fName, i + 1);
-(JackPortFlags)port_f
+CaptureDriverF
-            jack_error("driver: cannot register port for %s", name);
-            return -1;
@@ -93 +92 @@
-    }
-
-    port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal;
-
-    for (i = 0; i < fPlaybackChannels; i++) {
-        snprintf(alias, sizeof(alias) - 1, "%s:%s:in%d", fAliasName, fPlaybackDriverName, i + 1);
-        snprintf(name, sizeof(name) - 1, "%s:playback_%d", fClientControl.fName, i + 1);
-(JackPortFlags)port_f
+PlaybackDriverF
-            jack_error("driver: cannot register port for %s", name);
-            return -1;

jack2/branches/libjacknet/common/JackMutex.h

@@ -37 +37 @@
-{
-
-ivate
-
+otected
+
-        JackMutex fMutex;
-
-    protected:
-
-        JackLockAble()

jack2/branches/libjacknet/common/JackNetOneDriver.cpp

@@ -139 +139 @@
-        char buf[64];
-        unsigned int chn;
-        int port_flags;
-
-
-        //if (netj.handle_transport_sync)
-        //    jack_set_sync_callback(netj.client, (JackSyncCallback) net_driver_sync_cb, NULL);
-
-        port_flags = JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal;
-
-        for (chn = 0; chn < netj.capture_channels_audio; chn++) {
-            snprintf (buf, sizeof(buf) - 1, "system:capture_%u", chn + 1);
-
-            if ( ( port_id = fGraphManager->AllocatePort ( fClientControl.fRefNum, buf, JACK_DEFAULT_AUDIO_TYPE,
-static_cast<JackPortFlags> ( port_flags )
+CaptureDriverFlags
-            {
-                jack_error ( "driver: cannot register port for %s", buf );
@@ -185 +181 @@
-
-            if ( ( port_id = fGraphManager->AllocatePort ( fClientControl.fRefNum, buf, JACK_DEFAULT_MIDI_TYPE,
-static_cast<JackPortFlags> ( port_flags )
+CaptureDriverFlags
-            {
-                jack_error ( "driver: cannot register port for %s", buf );
@@ -196 +192 @@
-        }
-
-        port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal;
-
-        for (chn = 0; chn < netj.playback_channels_audio; chn++) {
-            snprintf (buf, sizeof(buf) - 1, "system:playback_%u", chn + 1);
-
-            if ( ( port_id = fGraphManager->AllocatePort ( fClientControl.fRefNum, buf, JACK_DEFAULT_AUDIO_TYPE,
-static_cast<JackPortFlags> ( port_flags )
+PlaybackDriverFlags
-            {
-                jack_error ( "driver: cannot register port for %s", buf );
@@ -232 +226 @@
-
-            if ( ( port_id = fGraphManager->AllocatePort ( fClientControl.fRefNum, buf, JACK_DEFAULT_MIDI_TYPE,
-static_cast<JackPortFlags> ( port_flags )
+PlaybackDriverFlags
-            {
-                jack_error ( "driver: cannot register port for %s", buf );

jack2/branches/libjacknet/doxyfile

@@ -24 +24 @@
-# if some version control system is used.
-
-5
+6
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 

jack2/branches/libjacknet/example-clients/lsp.c

@@ -209 +209 @@
-                                        fputs ("terminal,", stdout);
-                                }
+                
+                if (flags & JackPortIsActive) {
+                    fputs ("active,", stdout);
+                } else {
+                    fputs ("non-active,", stdout);
+                }
-                                putc ('\n', stdout);
-                        }

jack2/branches/libjacknet/linux/alsa/alsa_rawmidi.c

@@ -433 +433 @@
-
-        port->jack = jack_port_register(midi->client, name, JACK_DEFAULT_MIDI_TYPE,
-|JackPortIsTerminal
+ | JackPortIsTerminal | JackPortIsActive
-                
-        if (port->jack) 

jack2/branches/libjacknet/linux/alsa/alsa_seqmidi.c

@@ -489 +489 @@
-
-        if (snd_seq_port_info_get_type (info) & (SND_SEQ_PORT_TYPE_HARDWARE|SND_SEQ_PORT_TYPE_PORT|SND_SEQ_PORT_TYPE_SPECIFIC)) {
-|JackPortIsTerminal
+ | JackPortIsTerminal | JackPortIsActive
-        }
-

jack2/branches/libjacknet/linux/alsa/JackAlsaDriver.cpp

@@ -2088 +2088 @@
-    assert(fPlaybackChannels < DRIVER_PORT_NUM);
-
-JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal
+(unsigned long)CaptureDriverFlags
-
-    alsa_driver_t* alsa_driver = (alsa_driver_t*)fDriver;
@@ -2115 +2115 @@
-    }
-
-JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal
+(unsigned long)PlaybackDriverFlags
-
-    for (int i = 0; i < fPlaybackChannels; i++) {
@@ -2136 +2136 @@
-            jack_log("Create monitor port ");
-            snprintf(name, sizeof(name) - 1, "%s:monitor_%d", fClientControl.fName, i + 1);
-JackPortIsOutput
+MonitorDriverFlags
-                jack_error ("ALSA: cannot register monitor port for %s", name);
-            } else {

jack2/branches/libjacknet/linux/firewire/JackFFADODriver.cpp

@@ -360 +360 @@
-    JackPort* port;
-    int port_index;
-    unsigned long port_flags;
-
-    char buf[JACK_PORT_NAME_SIZE];
-    char portname[JACK_PORT_NAME_SIZE];
@@ -419 +417 @@
-
-    // capture
-    port_flags = JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal;
-
-    driver->capture_nchannels = ffado_streaming_get_nb_capture_streams(driver->dev);
-    driver->capture_channels = (ffado_capture_channel_t *)calloc(driver->capture_nchannels, sizeof(ffado_capture_channel_t));
@@ -434 +430 @@
-        driver->capture_channels[chn].stream_type = ffado_streaming_get_capture_stream_type(driver->dev, chn);
-        if (driver->capture_channels[chn].stream_type == ffado_stream_type_audio) {
-AC%d_%s", fClientControl.fName, (int)chn
+%s", fClientControl.fName
-            printMessage ("Registering audio capture port %s", buf);
-            if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf,
-                              JACK_DEFAULT_AUDIO_TYPE,
-(JackPortFlags)port_f
+CaptureDriverF
-                              fEngineControl->fBufferSize)) == NO_PORT) {
-                jack_error("driver: cannot register port for %s", buf);
@@ -452 +448 @@
-            port = fGraphManager->GetPort(port_index);
-            port->SetLatency(driver->period_size + driver->capture_frame_latency);
+            // capture port aliases (jackd1 style port names)
+            snprintf(buf, sizeof(buf) - 1, "%s:capture_%i", fClientControl.fName, (int) chn + 1);
+            port->SetAlias(buf);
-            fCapturePortList[chn] = port_index;
-            jack_log("JackFFADODriver::Attach fCapturePortList[i] %ld ", port_index);
@@ -457 +456 @@
-
-        } else if (driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
-MC%d_%s", fClientControl.fName, (int)chn
+%s", fClientControl.fName
-            printMessage ("Registering midi capture port %s", buf);
-            if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf,
-                              JACK_DEFAULT_MIDI_TYPE,
-(JackPortFlags)port_f
+CaptureDriverF
-                              fEngineControl->fBufferSize)) == NO_PORT) {
-                jack_error("driver: cannot register port for %s", buf);
@@ -490 +489 @@
-
-    // playback
-    port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal;
-
-    driver->playback_nchannels = ffado_streaming_get_nb_playback_streams(driver->dev);
-    driver->playback_channels = (ffado_playback_channel_t *)calloc(driver->playback_nchannels, sizeof(ffado_playback_channel_t));
@@ -506 +503 @@
-
-        if (driver->playback_channels[chn].stream_type == ffado_stream_type_audio) {
-AP%d_%s", fClientControl.fName, (int)chn
+%s", fClientControl.fName
-            printMessage ("Registering audio playback port %s", buf);
-            if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf,
-                              JACK_DEFAULT_AUDIO_TYPE,
-(JackPortFlags)port_f
+PlaybackDriverF
-                              fEngineControl->fBufferSize)) == NO_PORT) {
-                jack_error("driver: cannot register port for %s", buf);
@@ -527 +524 @@
-            // Add one buffer more latency if "async" mode is used...
-            port->SetLatency((driver->period_size * (driver->device_options.nb_buffers - 1)) + ((fEngineControl->fSyncMode) ? 0 : fEngineControl->fBufferSize) + driver->playback_frame_latency);
+            // playback port aliases (jackd1 style port names)
+            snprintf(buf, sizeof(buf) - 1, "%s:playback_%i", fClientControl.fName, (int) chn + 1);
+            port->SetAlias(buf);
-            fPlaybackPortList[chn] = port_index;
-            jack_log("JackFFADODriver::Attach fPlaybackPortList[i] %ld ", port_index);
-            fPlaybackChannels++;
-        } else if (driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
-MP%d_%s", fClientControl.fName, (int)chn
+%s", fClientControl.fName
-            printMessage ("Registering midi playback port %s", buf);
-            if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf,
-                              JACK_DEFAULT_MIDI_TYPE,
-(JackPortFlags)port_f
+PlaybackDriverF
-                              fEngineControl->fBufferSize)) == NO_PORT) {
-                jack_error("driver: cannot register port for %s", buf);

jack2/branches/libjacknet/linux/freebob/JackFreebobDriver.cpp

@@ -668 +668 @@
-    JackPort* port;
-    int port_index;
-
-
+
-    char buf[JACK_PORT_NAME_SIZE];
-    char portname[JACK_PORT_NAME_SIZE];
@@ -718 +717 @@
-
-    // capture
-    port_flags = JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal;
-
-    driver->capture_nchannels = freebob_streaming_get_nb_capture_streams(driver->dev);
-    driver->capture_nchannels_audio = 0;
@@ -735 +732 @@
-            if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf,
-                              JACK_DEFAULT_AUDIO_TYPE,
-(JackPortFlags)port_f
+CaptureDriverF
-                              fEngineControl->fBufferSize)) == NO_PORT) {
-                jack_error("driver: cannot register port for %s", buf);
@@ -749 +746 @@
-
-    // playback
-    port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal;
-
-    driver->playback_nchannels = freebob_streaming_get_nb_playback_streams(driver->dev);
-    driver->playback_nchannels_audio = 0;
@@ -765 +760 @@
-            if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf,
-                              JACK_DEFAULT_AUDIO_TYPE,
-(JackPortFlags)port_f
+PlaybackDriverF
-                              fEngineControl->fBufferSize)) == NO_PORT) {
-                jack_error("driver: cannot register port for %s", buf);

jack2/branches/libjacknet/macosx/coreaudio/JackCoreAudioDriver.cpp

@@ -1561 +1561 @@
-    char name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-    char alias[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-
-
+
-    jack_log("JackCoreAudioDriver::Attach fBufferSize %ld fSampleRate %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate);
-
@@ -1581 +1580 @@
-        snprintf(name, sizeof(name) - 1, "%s:capture_%d", fClientControl.fName, i + 1);
-
-(JackPortFlags)port_f
+CaptureDriverF
-            jack_error("Cannot register port for %s", name);
-            return -1;
@@ -1601 +1600 @@
-        fCapturePortList[i] = port_index;
-    }
-
-    port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal;
-
-    for (int i = 0; i < fPlaybackChannels; i++) {
@@ -1620 +1617 @@
-        snprintf(name, sizeof(name) - 1, "%s:playback_%d", fClientControl.fName, i + 1);
-
-(JackPortFlags)port_f
+PlaybackDriverF
-            jack_error("Cannot register port for %s", name);
-            return -1;
@@ -1645 +1642 @@
-            jack_log("Create monitor port ");
-            snprintf(name, sizeof(name) - 1, "%s:monitor_%u", fClientControl.fName, i + 1);
-JackPortIsOutput
+MonitorDriverFlags
-                jack_error("Cannot register monitor port for %s", name);
-                return -1;

jack2/branches/libjacknet/macosx/coremidi/JackCoreMidiDriver.cpp

@@ -223 +223 @@
-    char endpoint_name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-    char alias[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-    unsigned long port_flags = JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal;
-    int i;
-
@@ -240 +239 @@
-        
-        snprintf(name, sizeof(name) - 1, "%s:capture_%d", fClientControl.fName, i + 1);
-(JackPortFlags)port_f
+CaptureDriverF
-            jack_error("driver: cannot register port for %s", name);
-            return -1;
@@ -249 +248 @@
-        jack_log("JackCoreMidiDriver::Attach fCapturePortList[i] port_index = %ld", port_index);
-    }
-
-    port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal;
-
-    for (i = 0; i < fPlaybackChannels; i++) {
@@ -264 +261 @@
-        
-        snprintf(name, sizeof(name) - 1, "%s:playback_%d", fClientControl.fName, i + 1);
-(JackPortFlags)port_f
+PlaybackDriverF
-            jack_error("driver: cannot register port for %s", name);
-            return -1;

jack2/branches/libjacknet/macosx/Jack-Info.plist

@@ -8 +8 @@
-        <string>Jackservermp</string>
-        <key>CFBundleGetInfoString</key>
-5, @03-09
+6, @03-10
-        <key>CFBundleIdentifier</key>
-        <string>com.grame.Jackmp</string>
@@ -20 +20 @@
-        <string>????</string>
-        <key>CFBundleVersion</key>
-5
+6
-</dict>
-</plist>

jack2/branches/libjacknet/macosx/Jackdmp.xcodeproj/project.pbxproj

@@ -581 +581 @@
-                4B80D7EC0BA0D17400F035BB /* JackMidiPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B80D7E60BA0D17400F035BB /* JackMidiPort.cpp */; };
-                4B80D7ED0BA0D17400F035BB /* JackMidiAPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B80D7E70BA0D17400F035BB /* JackMidiAPI.cpp */; };
+                4B88D03B11298BEE007A87C1 /* weakjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03911298BEE007A87C1 /* weakjack.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D03C11298BEE007A87C1 /* weakmacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03A11298BEE007A87C1 /* weakmacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D03D11298BEE007A87C1 /* weakjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03911298BEE007A87C1 /* weakjack.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D03E11298BEE007A87C1 /* weakmacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03A11298BEE007A87C1 /* weakmacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D03F11298BEE007A87C1 /* weakjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03911298BEE007A87C1 /* weakjack.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D04011298BEE007A87C1 /* weakmacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03A11298BEE007A87C1 /* weakmacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D04111298BEE007A87C1 /* weakjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03911298BEE007A87C1 /* weakjack.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D04211298BEE007A87C1 /* weakmacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03A11298BEE007A87C1 /* weakmacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D04311298BEE007A87C1 /* weakjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03911298BEE007A87C1 /* weakjack.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D04411298BEE007A87C1 /* weakmacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03A11298BEE007A87C1 /* weakmacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D04511298BEE007A87C1 /* weakjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03911298BEE007A87C1 /* weakjack.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                4B88D04611298BEE007A87C1 /* weakmacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03A11298BEE007A87C1 /* weakmacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
-                4B93F1990E87992100E4ECCD /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6A20E703B2E0066E42F /* JackPosixThread.cpp */; };
-                4B93F19A0E87992200E4ECCD /* JackPosixThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6A30E703B2E0066E42F /* JackPosixThread.h */; };
@@ -1568 +1580 @@
-                4B869B4208C8D22F001CF041 /* JackDriverLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackDriverLoader.h; path = ../common/JackDriverLoader.h; sourceTree = SOURCE_ROOT; };
-                4B869D7F08C9CB00001CF041 /* JackDriverLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackDriverLoader.cpp; path = ../common/JackDriverLoader.cpp; sourceTree = SOURCE_ROOT; };
+                4B88D03911298BEE007A87C1 /* weakjack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = weakjack.h; path = ../common/jack/weakjack.h; sourceTree = SOURCE_ROOT; };
+                4B88D03A11298BEE007A87C1 /* weakmacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = weakmacros.h; path = ../common/jack/weakmacros.h; sourceTree = SOURCE_ROOT; };
-                4B89B759076B731100D170DE /* JackRPCClientUser.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = JackRPCClientUser.c; path = RPC/JackRPCClientUser.c; sourceTree = SOURCE_ROOT; };
-                4B89B769076B74D200D170DE /* JackRPCEngineUser.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = JackRPCEngineUser.c; path = RPC/JackRPCEngineUser.c; sourceTree = SOURCE_ROOT; };
@@ -2712 +2726 @@
-                                4B6C737E0CC60A6D001AFFD4 /* transport.h */,
-                                4B6C737F0CC60A6D001AFFD4 /* types.h */,
+                                4B88D03911298BEE007A87C1 /* weakjack.h */,
+                                4B88D03A11298BEE007A87C1 /* weakmacros.h */,
-                        );
-                        name = jack;
@@ -3160 +3176 @@
-                                4B93F19E0E87998400E4ECCD /* JackPosixThread.h in Headers */,
-                                4BECB2FA0F4451C10091B70A /* JackProcessSync.h in Headers */,
+                                4B88D03F11298BEE007A87C1 /* weakjack.h in Headers */,
+                                4B88D04011298BEE007A87C1 /* weakmacros.h in Headers */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -3228 +3246 @@
-                                4BCBCE6210C4FE3F00450FFE /* JackPhysicalMidiInput.h in Headers */,
-                                4BCBCE6410C4FE3F00450FFE /* JackPhysicalMidiOutput.h in Headers */,
+                                4B88D04311298BEE007A87C1 /* weakjack.h in Headers */,
+                                4B88D04411298BEE007A87C1 /* weakmacros.h in Headers */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -3508 +3528 @@
-                                4B47ACAA10B5890100469C67 /* JackPosixThread.h in Headers */,
-                                4B47ACAB10B5890100469C67 /* JackProcessSync.h in Headers */,
+                                4B88D04111298BEE007A87C1 /* weakjack.h in Headers */,
+                                4B88D04211298BEE007A87C1 /* weakmacros.h in Headers */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -3593 +3615 @@
-                                4BECB2F80F4451C10091B70A /* JackProcessSync.h in Headers */,
-                                4B94334A10A5E666002A187F /* systemdeps.h in Headers */,
+                                4B88D03B11298BEE007A87C1 /* weakjack.h in Headers */,
+                                4B88D03C11298BEE007A87C1 /* weakmacros.h in Headers */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -3665 +3689 @@
-                                4BCBCE5E10C4FE3F00450FFE /* JackPhysicalMidiInput.h in Headers */,
-                                4BCBCE6010C4FE3F00450FFE /* JackPhysicalMidiOutput.h in Headers */,
+                                4B88D03D11298BEE007A87C1 /* weakjack.h in Headers */,
+                                4B88D03E11298BEE007A87C1 /* weakmacros.h in Headers */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -3842 +3868 @@
-                                4BCBCE6610C4FE3F00450FFE /* JackPhysicalMidiInput.h in Headers */,
-                                4BCBCE6810C4FE3F00450FFE /* JackPhysicalMidiOutput.h in Headers */,
+                                4B88D04511298BEE007A87C1 /* weakjack.h in Headers */,
+                                4B88D04611298BEE007A87C1 /* weakmacros.h in Headers */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

jack2/branches/libjacknet/posix/JackNetUnixSocket.cpp

@@ -100 +100 @@
-        }
-        fSockfd = socket ( AF_INET, SOCK_DGRAM, 0 );
+        
+        /* Enable address reuse */
+        int res, on = 1;
+        if ((res = setsockopt( fSockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on))) < 0) {
+            StrError(NET_ERROR_CODE);
+        }
+            
-        return fSockfd;
-    }

jack2/branches/libjacknet/posix/JackPosixMutex.h

@@ -104 +104 @@
-        }
-
-void
+bool
-        {
-            int res = pthread_mutex_lock(&fMutex);
-            if (res != 0)
-                jack_error("JackPosixMutex::Lock res = %d", res);
+            return (res == 0);
-        }
-
@@ -116 +117 @@
-        }
-
-void
+bool
-        {
-            int res = pthread_mutex_unlock(&fMutex);
-            if (res != 0)
-                jack_error("JackPosixMutex::Unlock res = %d", res);
+            return (res == 0);
-        }
-

jack2/branches/libjacknet/README

@@ -215 +215 @@
-1.9.3 : New JackBoomerDriver class for Boomer driver on Solaris. Add mixed 32/64 bits mode (off by default). Native MIDI backend (JackCoreMidiDriver, JackWinMMEDriver). In ALSA audio card reservation code, tries to open the card even if reservation fails. Clock source setting on Linux. Add jackctl_server_switch_master API. Fix transport callback (timebase master, sync) issue when used after jack_activate (RT thread was not running). D-Bus access for jackctl_server_add_slave/jackctl_server_remove_slave API. Cleanup "loopback" stuff in server. Torben Hohn fix for InitTime and GetMicroSeconds in JackWinTime.c. New jack_free function added in jack.h. Reworked Torben Hohn fix for server restart issue on Windows. Correct jack_set_error_function, jack_set_info_function and jack_set_thread_creator functions. Correct JackFifo::TimedWait for EINTR handling. Move DBus based audio device reservation code in ALSA backend compilation. Correct JackTransportEngine::MakeAllLocating, sync callback has to be called in this case also. NetJack2 code : better error checkout, method renaming. Tim Bechmann patch : hammerfall, only release monitor thread, if it has been created. Tim Bechmann memops.c optimization patches. In combined --dbus and --classic compilation code, use PulseAudio acquire/release code. Big rewrite of Solaris boomer driver, seems to work in duplex mode at least. Loopback backend reborn as a dynamically loadable separated backend. 
-1.9.4 : Solaris boomer backend now working in capture or playback only mode. Add a -G parameter in CoreAudio backend (the computation value in RT thread expressed as percent of period). Use SNDCTL_DSP_SYNCGROUP/SNDCTL_DSP_SYNCSTART API to synchronize input and output in Solaris boomer backend. Big endian bug fix in memops.c. Fix issues in JackNetDriver::DecodeTransportData and JackNetDriver::Initialize. Correct CPU timing in JackNetDriver, now take cycle begin time after Read. Simplify transport in NetJack2: master only can control transport. Change CoreAudio notification thread setup for OSX Snow Leopard. Correct server temporary mode : now set a global and quit after server/client message handling is finished. Add a string parameter to server ==> client notification, add a new JackInfoShutdownCallback type. CoreAudio backend now issue a JackInfoShutdownCallback when an unrecoverable error is detected (sampling rate change, stream configuration changeÉ).  Correct jackdmp.cpp (failures case were not correct..). Improve JackCoreAudioDriver code. Raise default port number to 2048. Correct JackProcessSync::LockedTimedWait. Correct JACK_MESSAGE_SIZE value, particularly in OSX RPC code. Now start server channel thread only when backend has been started (so in JackServer::Start). Should solve race conditions at start time. jack_verbose moved to JackGlobals class. Improve aggregate device management in JackCoreAudioDriver : now a "private" device only and cleanup properly. Aggregate device code added to JackCoreAudioAdapter. Implement "hog mode" (exclusive access of the audio device) in JackCoreAudioDriver. Fix jack_set_sample_rate_callback to have he same behavior as in JACK1. Dynamic system version detection in JackCoreAudioDriver to either create public or private aggregate device. In JackCoreAudioDriver, force the SR value to the wanted one *before* creating aggregate device (otherwise creation will fail).  In JackCoreAudioDriver, better cleanup of AD when intermediate open failure. In JackCoreAudioDriver::Start, wait for the audio driver to effectively start (use the MeasureCallback). In JackCoreAudioDriver, improve management of input/output channels: -1 is now used internally to indicate a wanted max value. In JackCoreAudioDriver::OpenAUHAL, correct stream format setup and cleanup. Correct crash bug in JackAudioAdapterInterface when not input is used in adapter (temporary fixÉ). Sync JackCoreAudioAdapter code on JackCoreAudioDriver one. JACK_SCHED_POLICY switched to SCHED_FIFO. Now can aggregate device that are themselves AD. No reason to make jack_on_shutdown deprecated, so revert the incorrect change. Thread AcquireRealTime and DropRealTime were (incorrectly) using fThread field. Use pthread_self()) (or GetCurrentThread() on Windows) to get the calling thread. Correctly save and restore RT mode state in freewheel mode. Correct freewheel code on client side. Fix AcquireRealTime and DropRealTime: now distinguish when called from another thread (AcquireRealTime/DropRealTime) and from the thread itself (AcquireSelfRealTime/DropSelfRealTime). Correct JackPosixThread::StartImp : thread priority setting now done in the RT case only. Correct JackGraphManager::GetBuffer for the "client loop with one connection" case : buffer must be copied. Correct JackInfoShutdownCallback prototype, two new JackClientProcessFailure and JackClientZombie JackStatus code. Correct JackCoreAudio driver when empty strings are given as -C, -P or -d parameter. Better memory allocation error checking on client (library) side. Better memory allocation error checking in ringbuffer.c, weak import improvements. Memory allocation error checking for jack_client_new and jack_client_open (server and client side). Memory allocation error checking in server for RPC. Simplify server temporary mode : now use a JackTemporaryException. Lock/Unlock shared memory segments (to test...). Sync with JACK1 : -r parameter now used for no-realtime, realtime (-R) is now default, usable backend given vie platform. In JackCoreAudio driver, (possibly) clock drift compensation when needed in aggregated devices. In JackCoreAudio driver, clock drift compensation in aggregated devices working. In JackCoreAudio driver, clock drift compensation semantic changed a bit : when on, does not activate if not needed (same clock domain). Sync JackCoreAudioAdapter code with JackCoreAudioDriver.
+1.9.5 : Dynamic choice of maximum port number. More robust sample rate change handling code in JackCoreAudioDriver. Devin Anderson patch for Jack FFADO driver issues with lost MIDI bytes between periods (and more). Fix port_rename callback : now both old name and new name are given as parameters. Special code in JackCoreAudio driver to handle completely buggy Digidesign CoreAudio user-land driver. Ensure that client-side message buffer thread calls thread_init callback if/when it is set by the client (backport of JACK1 rev 3838). Check dynamic port-max value. Fix JackCoreMidiDriver::ReadProcAux when ring buffer is full (thanks Devin Anderson). Josh Green ALSA driver capture only patch. When threads are cancelled, the exception has to be rethrown.  Use a QUIT notification to properly quit the server channel, the server channel thread can then be 'stopped' instead of 'canceled'. Mario Lang alsa_io time calculation overflow patch. Shared memory manager was calling abort in case of fatal error, now return an error in caller. Change JackEngineProfiling and JackAudioAdapterInterface gnuplot scripts to output SVG instead of PDF.   
-
-This is a work in progress but the implementation is now stable enough to be tested. jackdmp has been used successfully with the following applications : Ardour, Hydrogen, Jamin, Qjackctl, Jack-Rack, SooperLooper, AlsaPlayer...  

jack2/branches/libjacknet/tests/test.cpp

@@ -184 +184 @@
-int Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg)
-{
-
+, old_name, new_name
-     port_rename_clbk = 1;
-     return 0;
@@ -823 +823 @@
-    }
-
+    port_callback_reg = 0;      // number of port registration received by the callback
+    
-    /**
-     * Activate the client
@@ -841 +843 @@
-    if (port_rename_clbk == 0)
-        printf("!!! ERROR !!! Jack_Port_Rename_Callback was not called !!.\n");
+        
+        
+    /**
+     * Test if portregistration callback have been called.
+     *
+     */
+     
+    jack_sleep(1 * 1000); 
+
+    if (1 == port_callback_reg) {
+        Log("%i ports have been successfully created, and %i callback reg ports have been received... ok\n", 1, port_callback_reg);
+    } else {
+        printf("!!! ERROR !!! %i ports have been created, and %i callback reg ports have been received !\n", 1, port_callback_reg);
+    }
- 
-    /**
@@ -1096 +1112 @@
-
-    jack_sleep(1 * 1000); // To hope all port registration and reorder callback have been received...
+    
+    // Check port registration callback
-    if (j == port_callback_reg) {
-        Log("%i ports have been successfully created, and %i callback reg ports have been received... ok\n", j, port_callback_reg);
-    } else {
-
-
+
+
+
-    if (reorder == (2 * j)) {
-        Log("%i graph reorder callback have been received... ok\n", reorder);
@@ -1148 +1167 @@
-     *
-     */
+    port_callback_reg = 0; // to check registration callback
-    Log("Deregistering all ports of the client...\n");
-    inports = jack_get_ports(client1, NULL, NULL, 0);
@@ -1160 +1180 @@
-        }
-        a++;
+    }
+    
+    // Check port registration callback again
+    if (j == port_callback_reg) { 
+        Log("%i ports have been successfully created, and %i callback reg ports have been received... ok\n", j, port_callback_reg);
+    } else {
+        printf("!!! ERROR !!! %i ports have been created, and %i callback reg ports have been received !\n", j, port_callback_reg);
-    }
-

jack2/branches/libjacknet/windows/jackaudioadapter.rc

@@ -12 +12 @@
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-5
-5
+6
+6
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
@@ -24 +24 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp Audio Adapter for Windows\0"
-5
+6
-            VALUE "InternalName", "audioadapter\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "audioadapter.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "audioadapter\0"
-5
+6
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/jackd.rc

@@ -12 +12 @@
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-5
-5
+6
+6
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_APP
@@ -24 +24 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jack server for Windows\0"
-5
+6
-            VALUE "InternalName", "jackd\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "jackd.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "jackd\0"
-5
+6
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/jacknetadapter.rc

@@ -12 +12 @@
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-5
-5
+6
+6
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
@@ -24 +24 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp Net Adapter for Windows\0"
-5
+6
-            VALUE "InternalName", "netadapter\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "netadapter.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "netadapter\0"
-5
+6
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/jacknetdriver.rc

@@ -12 +12 @@
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-5
-5
+6
+6
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
@@ -24 +24 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp Net Driver for Windows\0"
-5
+6
-            VALUE "InternalName", "jack_netdriver\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "jack_netdriver.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "jack_netdriver\0"
-5
+6
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/jacknetmanager.rc

@@ -12 +12 @@
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-5
-5
+6
+6
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
@@ -24 +24 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp Net Manager for Windows\0"
-5
+6
-            VALUE "InternalName", "netmanager\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "netmanager.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "netmanager\0"
-5
+6
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/jackportaudio.rc

@@ -12 +12 @@
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-5
-5
+6
+6
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
@@ -24 +24 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp PortAudio Driver for Windows\0"
-5
+6
-            VALUE "InternalName", "jack_portaudio\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "jack_portaudio.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "jack_portaudio\0"
-5
+6
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/JackRouter/resource.rc

@@ -29 +29 @@
-
-VS_VERSION_INFO VERSIONINFO
-0
-0
+1
+1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
@@ -48 +48 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "JackRouter ASIO driver\0"
-0
+1
-            VALUE "InternalName", "JackRouter\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "JackRouter.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "JackRouter\0"
-0
+1
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/jackwinmme.rc

@@ -12 +12 @@
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-5
-5
+6
+6
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
@@ -24 +24 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp WinMMEo Driver for Windows\0"
-5
+6
-            VALUE "InternalName", "jack_portaudio\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "jack_winmme.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "jack_winmme\0"
-5
+6
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/JackWinMutex.h

@@ -44 +44 @@
-            fMutex = (HANDLE)CreateMutex(0, FALSE, 0);
-        }
-
+
-        virtual ~JackWinMutex()
-        {
@@ -50 +50 @@
-        }
-
-void
+bool
-        {
-                       WaitForSingleObject(fMutex, INFINITE
+            return (WAIT_OBJECT_0 == WaitForSingleObject(fMutex, INFINITE)
-        }
-
@@ -60 +60 @@
-        }
-
-void
+bool
-        {
-ReleaseMutex(fMutex
+return(ReleaseMutex(fMutex) != 0
-        }
-

jack2/branches/libjacknet/windows/libjack.rc

@@ -12 +12 @@
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-5
-5
+6
+6
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
@@ -24 +24 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jack client library for Windows\0"
-5
+6
-            VALUE "InternalName", "libjack\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "libjack.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "libjack\0"
-5
+6
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/libjackserver.rc

@@ -12 +12 @@
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-5
-5
+6
+6
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
@@ -24 +24 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jack server library for Windows\0"
-
+6
-            VALUE "InternalName", "libjackserver\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "libjackserver.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "libjackserver\0"
-5
+6
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/resource.rc

@@ -15 +15 @@
-#ifndef _MAC
-VS_VERSION_INFO VERSIONINFO
-5
-5
+6
+6
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
@@ -34 +34 @@
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp for Windows\0"
-5
+6
-            VALUE "InternalName", "libjackmp\0"
-09
+10
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "libjackmp.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "libjackmp\0"
-5
+6
-            VALUE "SpecialBuild", "\0"
-        END

jack2/branches/libjacknet/windows/Setup/jack.ci

@@ -2 +2 @@
-      version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" > 
-   <output> .</>
-5
+6
-   <digitsign> </>
-5
+6
-   <password> </>
-   <addlang> </>
@@ -93 +93 @@
-<_><src>..\..\common\jack\types.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\systemdeps.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
+<_><src>..\..\common\jack\weakjack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
+<_><src>..\..\common\jack\weakmacros.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
-<_><src>.\JackRouter.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\JackRouter.ini</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>

jack2/branches/libjacknet/windows/winmme/JackWinMMEDriver.cpp

@@ -290 +290 @@
-    char name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-    char alias[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
-    unsigned long port_flags = JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal;
-    MMRESULT res;
-    int i;
@@ -306 +305 @@
-        snprintf(name, sizeof(name) - 1, "%s:capture_%d", fClientControl.fName, i + 1);
-
-(JackPortFlags)port_f
+CaptureDriverF
-            jack_error("driver: cannot register port for %s", name);
-            return -1;
@@ -315 +314 @@
-        jack_log("JackMidiDriver::Attach fCapturePortList[i] port_index = %ld", port_index);
-    }
-
-    port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal;
-
-    for (i = 0; i < fPlaybackChannels; i++) {
@@ -328 +325 @@
-        snprintf(name, sizeof(name) - 1, "%s:playback_%d", fClientControl.fName, i + 1);
-
-(JackPortFlags)port_f
+PlaybackDriverF
-            jack_error("driver: cannot register port for %s", name);
-            return -1;

jack2/branches/libjacknet/wscript

@@ -12 +12 @@
-import Logs
-
-4
+6
-APPNAME='jack'
-JACK_API_VERSION = '0.1.0'