rebase from trunk 3336:3353

git-svn-id: http://subversion.jackaudio.org/jack/jack2/branches/libjacknet@3354 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -22,7 +22,12 @@ Michael Voigt
 ---------------------------
   Jackdmp changes log
 ---------------------------
-
+
+2009-02-25 Stephane Letz  <letz@grame.fr>
+
+	* Fix JackNetDriver::Close method.
+        * For audio device reservation, add card_to_num function.
+
 2009-02-24 Stephane Letz  <letz@grame.fr>
 
 	* New libjacknet library with net.h and JackNetAPI.cpp files. New netmaster.c and netmaster.c examples.
@@ -30,13 +35,14 @@ Michael Voigt
 
 2009-02-23 Stephane Letz  <letz@grame.fr>
 
-	* Another fix in systemdeps.h and types.h: jack_time_t now uniquely defined in types.h.
+	* Another fix in systemdeps.h and types.h: jack_time_t now uniquely defined in types.h.
 	* Move generic code and data in JackNetInterface and JackNetMasterInterface classes.
+        * First version of D-Bus based audio device rerservation.
 
 2009-02-20 Stephane Letz  <letz@grame.fr>
 
 	* Add InitConnection and InitRendering methods in JackNetSlaveInterface, better packet type checking in JackNetSlaveInterface::SyncRecv.
-	* Change fMulticastIP handling in JackNetInterface.
+	* Change fMulticastIP handling in JackNetInterface.
         * Cleanup systemdeps.h on Windows.
 
 2009-02-17 Stephane Letz  <letz@grame.fr>

common/JackAudioAdapterInterface.h

@@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackResampler.h"
 #include "JackFilters.h"
+#include "JackConstants.h"
 
 namespace Jack
 {

common/JackControlAPI.cpp

@@ -576,8 +576,8 @@ jackctl_wait_signals(sigset_t signals)
                 // driver exit
                 waiting = false;
                 break;
-			case SIGTTOU:
-				break;
+            case SIGTTOU:
+                break;
             default:
                 waiting = false;
                 break;

common/JackInternalClient.cpp

@@ -179,20 +179,20 @@ int JackLoadableInternalClient::Init(const char* so_name)
     fHandle = LoadJackModule(path_to_so);
     jack_log("JackLoadableInternalClient::JackLoadableInternalClient path_to_so = %s", path_to_so);
 
-    if (fHandle == 0) {
+    if (fHandle == NULL) {
         PrintLoadError(so_name);
         return -1;
     }
 
     fFinish = (FinishCallback)GetJackProc(fHandle, "jack_finish");
-    if (!fFinish) {
+    if (fFinish == NULL) {
         UnloadJackModule(fHandle);
         jack_error("symbol jack_finish cannot be found in %s", so_name);
         return -1;
     }
 
     fDescriptor = (JackDriverDescFunction)GetJackProc(fHandle, "jack_get_descriptor");
-    if (!fDescriptor) {
+    if (fDescriptor == NULL) {
         jack_info("No jack_get_descriptor entry-point for %s", so_name);
     }
     return 0;
@@ -205,7 +205,7 @@ int JackLoadableInternalClient1::Init(const char* so_name)
     }
     
     fInitialize = (InitializeCallback)GetJackProc(fHandle, "jack_initialize");
-    if (!fInitialize) {
+    if (fInitialize == NULL) {
         UnloadJackModule(fHandle);
         jack_error("symbol jack_initialize cannot be found in %s", so_name);
         return -1;
@@ -221,7 +221,7 @@ int JackLoadableInternalClient2::Init(const char* so_name)
     }
     
     fInitialize = (InternalInitializeCallback)GetJackProc(fHandle, "jack_internal_initialize");
-    if (!fInitialize) {
+    if (fInitialize == NULL) {
         UnloadJackModule(fHandle);
         jack_error("symbol jack_internal_initialize cannot be found in %s", so_name);
         return -1;
@@ -244,9 +244,10 @@ JackLoadableInternalClient2::JackLoadableInternalClient2(JackServer* server, Jac
 
 JackLoadableInternalClient::~JackLoadableInternalClient()
 {
-    if (fFinish)
+    if (fFinish != NULL)
         fFinish(fProcessArg);
-    UnloadJackModule(fHandle);
+    if (fHandle != NULL)
+        UnloadJackModule(fHandle);
 }
 
 int JackLoadableInternalClient1::Open(const char* server_name, const char* name, jack_options_t options, jack_status_t* status)

common/JackNetAPI.cpp

@@ -124,7 +124,7 @@ namespace Jack
 
 struct JackNetExtMaster : public JackNetMasterInterface {
         
-    //sample buffers
+    // Data buffers
     float** fAudioCaptureBuffer;
     float** fAudioPlaybackBuffer;
     
@@ -142,8 +142,8 @@ struct JackNetExtMaster : public JackNetMasterInterface {
         assert(strlen(ip) < 32);
         strcpy(fMulticastIP, ip);
         fSocket.SetPort(port);
-        fRequest.buffer_size =  request->buffer_size;
-        fRequest.sample_rate =  request->sample_rate;
+        fRequest.buffer_size = request->buffer_size;
+        fRequest.sample_rate = request->sample_rate;
     }
                 
     virtual ~JackNetExtMaster()
@@ -391,8 +391,7 @@ struct JackNetExtMaster : public JackNetMasterInterface {
     {
         return 0;
     }
-
-
+    
 };
 
 struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterface {

common/JackNetDriver.cpp

@@ -91,14 +91,15 @@ namespace Jack
         }
     }
 
-#ifdef JACK_MONITOR
     int JackNetDriver::Close()
     {
+#ifdef JACK_MONITOR
         if ( fNetTimeMon )
             fNetTimeMon->Save();
+#endif
+        FreeAll();
         return JackDriver::Close();
     }
-#endif
 
     // Attach and Detach are defined as empty methods: port allocation is done when driver actually start (that is in Init)
     int JackNetDriver::Attach()
@@ -122,8 +123,10 @@ namespace Jack
         jack_log ( "JackNetDriver::Init()" );
 
         //new loading, but existing socket, restart the driver
-        if ( fSocket.IsSocket() )
-            Restart();
+        if (fSocket.IsSocket()) {
+            jack_info( "Restarting driver..." );
+            FreeAll();
+        }
 
         //set the parameters to send
         fParams.fSendAudioChannels = fCaptureChannels;
@@ -206,28 +209,28 @@ namespace Jack
         return true;
     }
 
-    void JackNetDriver::Restart()
+    void JackNetDriver::FreeAll()
     {
-        jack_log ( "JackNetDriver::Restart" );
-
-        jack_info ( "Restarting driver..." );
+        FreePorts();
+        
         delete[] fTxBuffer;
-        fTxBuffer = NULL;
         delete[] fRxBuffer;
-        fRxBuffer = NULL;
         delete fNetAudioCaptureBuffer;
-        fNetAudioCaptureBuffer = NULL;
         delete fNetAudioPlaybackBuffer;
-        fNetAudioPlaybackBuffer = NULL;
         delete fNetMidiCaptureBuffer;
-        fNetMidiCaptureBuffer = NULL;
         delete fNetMidiPlaybackBuffer;
-        fNetMidiPlaybackBuffer = NULL;
-        FreePorts();
         delete[] fMidiCapturePortList;
-        fMidiCapturePortList = NULL;
         delete[] fMidiPlaybackPortList;
+        
+        fTxBuffer = NULL;
+        fRxBuffer = NULL;
+        fNetAudioCaptureBuffer = NULL;
+        fNetAudioPlaybackBuffer = NULL;
+        fNetMidiCaptureBuffer = NULL;
+        fNetMidiPlaybackBuffer = NULL;
+        fMidiCapturePortList = NULL;
         fMidiPlaybackPortList = NULL;
+        
 #ifdef JACK_MONITOR
         delete fNetTimeMon;
         fNetTimeMon = NULL;
@@ -353,13 +356,17 @@ namespace Jack
         int audio_port_index;
         uint midi_port_index;
         for ( audio_port_index = 0; audio_port_index < fCaptureChannels; audio_port_index++ )
-            fGraphManager->ReleasePort ( fClientControl.fRefNum, fCapturePortList[audio_port_index] );
+            if (fCapturePortList[audio_port_index] > 0)
+                fGraphManager->ReleasePort ( fClientControl.fRefNum, fCapturePortList[audio_port_index] );
         for ( audio_port_index = 0; audio_port_index < fPlaybackChannels; audio_port_index++ )
-            fGraphManager->ReleasePort ( fClientControl.fRefNum, fPlaybackPortList[audio_port_index] );
+            if (fPlaybackPortList[audio_port_index] > 0)
+                fGraphManager->ReleasePort ( fClientControl.fRefNum, fPlaybackPortList[audio_port_index] );
         for ( midi_port_index = 0; midi_port_index < fParams.fSendMidiChannels; midi_port_index++ )
-            fGraphManager->ReleasePort ( fClientControl.fRefNum, fMidiCapturePortList[midi_port_index] );
+            if (fMidiCapturePortList[midi_port_index] > 0)
+                fGraphManager->ReleasePort ( fClientControl.fRefNum, fMidiCapturePortList[midi_port_index] );
         for ( midi_port_index = 0; midi_port_index < fParams.fReturnMidiChannels; midi_port_index++ )
-            fGraphManager->ReleasePort ( fClientControl.fRefNum, fMidiPlaybackPortList[midi_port_index] );
+            if (fMidiPlaybackPortList[midi_port_index] > 0)
+                fGraphManager->ReleasePort ( fClientControl.fRefNum, fMidiPlaybackPortList[midi_port_index] );
         return 0;
     }
 

common/JackNetDriver.h

@@ -51,7 +51,8 @@ namespace Jack
 #endif
 
             bool Init();
-            void Restart();
+            void FreeAll();
+            
             int AllocPorts();
             int FreePorts();
 
@@ -71,10 +72,7 @@ namespace Jack
             int Open ( jack_nframes_t frames_per_cycle, jack_nframes_t rate, bool capturing, bool playing,
                        int inchannels, int outchannels, bool monitor, const char* capture_driver_name,
                        const char* playback_driver_name, jack_nframes_t capture_latency, jack_nframes_t playback_latency );
-
-#ifdef JACK_MONITOR
             int Close();
-#endif
 
             int Attach();
             int Detach();

common/JackWaitThreadedDriver.h

@@ -31,7 +31,7 @@ namespace Jack
 \brief To be used as a wrapper of JackNetDriver. 
 
 The idea is to behave as the "dummy" driver, until the network connection is really started and processing starts. 
-The Execute method will call the ProcessNull() methods until the decorated driver Init method returns.
+The Execute method will call the ProcessNull method until the decorated driver Init method returns.
 A helper JackDriverStarter thread is used for that purpose.
 */
 

common/wscript

@@ -139,6 +139,9 @@ def build(bld):
             '../posix/JackSocketServerNotifyChannel.cpp',
             '../posix/JackNetUnixSocket.cpp',
             ]
+	    
+    if bld.env['IS_LINUX'] and bld.env['BUILD_JACKDBUS']:
+	serverlib.source += ['../dbus/reserve.c', '../dbus/audio_reserve.c']
 
     if bld.env['IS_SUN']:
         serverlib.source += [

dbus/audio_reserve.c

+/*
+    Copyright (C) 2009 Grame
+    
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "reserve.h"
+#include "audio_reserve.h"
+#include "JackError.h"
+
+static DBusConnection* connection = NULL;
+
+SERVER_EXPORT int audio_reservation_init()
+{
+    DBusError error;
+   
+    dbus_error_init(&error);
+
+    if (!(connection = dbus_bus_get(DBUS_BUS_SESSION, &error))) {
+        jack_error("Failed to connect to session bus for device reservation %s\n", error.message);
+        return -1;
+    }
+
+    return 0;
+}
+
+SERVER_EXPORT int audio_reservation_finish()
+{
+    if (connection) 
+        dbus_connection_unref(connection);
+    return 0;
+}
+
+SERVER_EXPORT void* audio_acquire(int num)
+{
+    DBusError error;
+    rd_device* device;
+    char audio_name[32];
+    int e;
+
+    snprintf(audio_name, sizeof(audio_name) - 1, "Audio%d", num);
+    if ((e = rd_acquire(
+                 &device,
+                 connection,
+                 audio_name,
+                 "Jack audio server",
+                 INT32_MAX,
+                 NULL,
+                 &error)) < 0) {
+
+        jack_error ("Failed to acquire device: %s\n", error.message ? error.message : strerror(-e));
+        return NULL;
+    }
+
+    jack_info("Acquire audio card %s", audio_name);
+    return (void*)device;
+}
+
+SERVER_EXPORT void audio_reserve_loop()
+{
+    if (connection) {
+       while (dbus_connection_read_write_dispatch (connection, -1))
+         ; // empty loop body
+    }
+}
+
+SERVER_EXPORT void audio_release(void* dev)
+{
+   rd_device* device = (rd_device*)dev;
+   if (device) {
+        jack_info("Release audio card");
+        rd_release(device);
+   }
+}

dbus/audio_reserve.h

+/*
+    Copyright (C) 2009 Grame
+    
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __audio_reserve__
+#define __audio_reserve__
+
+#include "JackCompilerDeps.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+SERVER_EXPORT int audio_reservation_init();
+SERVER_EXPORT int audio_reservation_finish();
+
+SERVER_EXPORT void* audio_acquire(int num);
+SERVER_EXPORT void audio_release(void* dev);
+SERVER_EXPORT void audio_reserve_loop();
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

dbus/reserve.c

+/***
+  Copyright 2009 Lennart Poettering
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+***/
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "reserve.h"
+
+struct rd_device {
+	int ref;
+
+	char *device_name;
+	char *application_name;
+	char *application_device_name;
+	char *service_name;
+	char *object_path;
+	int32_t priority;
+
+	DBusConnection *connection;
+
+	int owning:1;
+	int registered:1;
+	int filtering:1;
+	int gave_up:1;
+
+	rd_request_cb_t request_cb;
+	void *userdata;
+};
+
+
+#define SERVICE_PREFIX "org.freedesktop.ReserveDevice1."
+#define OBJECT_PREFIX "/org/freedesktop/ReserveDevice1/"
+
+static const char introspection[] =
+	DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
+	"<node>"
+	" <!-- If you are looking for documentation make sure to check out\n"
+	"      http://git.0pointer.de/?p=reserve.git;a=blob;f=reserve.txt -->\n"
+	" <interface name=\"org.freedesktop.ReserveDevice1\">"
+	"  <method name=\"RequestRelease\">"
+	"   <arg name=\"priority\" type=\"i\" direction=\"in\"/>"
+	"   <arg name=\"result\" type=\"b\" direction=\"out\"/>"
+	"  </method>"
+	"  <property name=\"Priority\" type=\"i\" access=\"read\"/>"
+	"  <property name=\"ApplicationName\" type=\"s\" access=\"read\"/>"
+	"  <property name=\"ApplicationDeviceName\" type=\"s\" access=\"read\"/>"
+	" </interface>"
+	" <interface name=\"org.freedesktop.DBus.Properties\">"
+	"  <method name=\"Get\">"
+	"   <arg name=\"interface\" direction=\"in\" type=\"s\"/>"
+	"   <arg name=\"property\" direction=\"in\" type=\"s\"/>"
+	"   <arg name=\"value\" direction=\"out\" type=\"v\"/>"
+	"  </method>"
+	" </interface>"
+	" <interface name=\"org.freedesktop.DBus.Introspectable\">"
+	"  <method name=\"Introspect\">"
+	"   <arg name=\"data\" type=\"s\" direction=\"out\"/>"
+	"  </method>"
+	" </interface>"
+	"</node>";
+
+static dbus_bool_t add_variant(
+	DBusMessage *m,
+	int type,
+	const void *data) {
+
+	DBusMessageIter iter, sub;
+	char t[2];
+
+	t[0] = (char) type;
+	t[1] = 0;
+
+	dbus_message_iter_init_append(m, &iter);
+
+	if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, t, &sub))
+		return FALSE;
+
+	if (!dbus_message_iter_append_basic(&sub, type, data))
+		return FALSE;
+
+	if (!dbus_message_iter_close_container(&iter, &sub))
+		return FALSE;
+
+	return TRUE;
+}
+
+static DBusHandlerResult object_handler(
+	DBusConnection *c,
+	DBusMessage *m,
+	void *userdata) {
+
+	rd_device *d;
+	DBusError error;
+	DBusMessage *reply = NULL;
+
+	dbus_error_init(&error);
+
+	d = userdata;
+	assert(d->ref >= 1);
+
+	if (dbus_message_is_method_call(
+		    m,
+		    "org.freedesktop.ReserveDevice1",
+		    "RequestRelease")) {
+
+		int32_t priority;
+		dbus_bool_t ret;
+
+		if (!dbus_message_get_args(
+			    m,
+			    &error,
+			    DBUS_TYPE_INT32, &priority,
+			    DBUS_TYPE_INVALID))
+			goto invalid;
+
+		ret = FALSE;
+
+		if (priority > d->priority && d->request_cb) {
+			d->ref++;
+
+			if (d->request_cb(d, 0) > 0) {
+				ret = TRUE;
+				d->gave_up = 1;
+			}
+
+			rd_release(d);
+		}
+
+		if (!(reply = dbus_message_new_method_return(m)))
+			goto oom;
+
+		if (!dbus_message_append_args(
+			    reply,
+			    DBUS_TYPE_BOOLEAN, &ret,
+			    DBUS_TYPE_INVALID))
+			goto oom;
+
+		if (!dbus_connection_send(c, reply, NULL))
+			goto oom;
+
+		dbus_message_unref(reply);
+
+		return DBUS_HANDLER_RESULT_HANDLED;
+
+	} else if (dbus_message_is_method_call(
+			   m,
+			   "org.freedesktop.DBus.Properties",
+			   "Get")) {
+
+		const char *interface, *property;
+
+		if (!dbus_message_get_args(
+			    m,
+			    &error,
+			    DBUS_TYPE_STRING, &interface,
+			    DBUS_TYPE_STRING, &property,
+			    DBUS_TYPE_INVALID))
+			goto invalid;
+
+		if (strcmp(interface, "org.freedesktop.ReserveDevice1") == 0) {
+			const char *empty = "";
+
+			if (strcmp(property, "ApplicationName") == 0 && d->application_name) {
+				if (!(reply = dbus_message_new_method_return(m)))
+					goto oom;
+
+				if (!add_variant(
+					    reply,
+					    DBUS_TYPE_STRING,
+					    d->application_name ? (const char**) &d->application_name : &empty))
+					goto oom;
+
+			} else if (strcmp(property, "ApplicationDeviceName") == 0) {
+				if (!(reply = dbus_message_new_method_return(m)))
+					goto oom;
+
+				if (!add_variant(
+					    reply,
+					    DBUS_TYPE_STRING,
+					    d->application_device_name ? (const char**) &d->application_device_name : &empty))
+					goto oom;
+
+			} else if (strcmp(property, "Priority") == 0) {
+				if (!(reply = dbus_message_new_method_return(m)))
+					goto oom;
+
+				if (!add_variant(
+					    reply,
+					    DBUS_TYPE_INT32,
+					    &d->priority))
+					goto oom;
+			} else {
+				if (!(reply = dbus_message_new_error_printf(
+					      m,
+					      DBUS_ERROR_UNKNOWN_METHOD,
+					      "Unknown property %s",
+					      property)))
+					goto oom;
+			}