--- linuxsampler/trunk/src/drivers/audio/AudioOutputDeviceJack.h	2004/08/20 17:25:19	221
+++ linuxsampler/trunk/src/drivers/audio/AudioOutputDeviceJack.h	2006/06/27 22:57:37	880
@@ -3,6 +3,7 @@
  *   LinuxSampler - modular, streaming capable sampler                     *
  *                                                                         *
  *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
+ *   Copyright (C) 2005, 2006 Christian Schoenebeck                        *
  *                                                                         *
  *   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  *
@@ -43,30 +44,80 @@
     class AudioOutputDeviceJack : public AudioOutputDevice {
         public:
             AudioOutputDeviceJack(std::map<String,DeviceCreationParameter*> Parameters);
-            ~AudioOutputDeviceJack();
+            virtual ~AudioOutputDeviceJack();
 
-            /** Audio Channel Parameter 'JACK_BINDINGS'
-             *
-             * Used to connect to other JACK clients.
+            /**
+             * Audio channel implementation for the JACK audio driver.
              */
-            class ParameterJackBindings : public DeviceRuntimeParameterStrings {
+            class AudioChannelJack : public AudioChannel {
                 public:
-                    ParameterJackBindings(AudioChannel* pChannel, std::vector<String> InitialBindings) : DeviceRuntimeParameterStrings(InitialBindings) { this->pChannel = pChannel; }
-                    virtual String              Description()                      { return "Bindings to other JACK clients";                     }
-                    virtual bool                Fix()                              { return false;                                                }
-                    virtual std::vector<String> PossibilitiesAsString()            { return std::vector<String>(); /* TODO: to be implemented */  }
-                    virtual void                OnSetValue(std::vector<String> vS) { /* TODO: code to connect to other jack clients */            }
+                    /** Audio Channel Parameter 'NAME'
+                     *
+                     * Used to assign an arbitrary name to an audio channel.
+                     */
+                    class ParameterName : public AudioChannel::ParameterName {
+                        public:
+                            ParameterName(AudioChannelJack* pChannel);
+                            virtual void OnSetValue(String s);
+                        protected:
+                            AudioChannelJack* pChannel;
+                    };
+
+                    /** Audio Channel Parameter 'JACK_BINDINGS'
+                     *
+                     * Used to connect to other JACK clients.
+                     */
+                    class ParameterJackBindings : public DeviceRuntimeParameterStrings {
+                        public:
+                            ParameterJackBindings(AudioChannelJack* pChannel);
+                            virtual String              Description();
+                            virtual bool                Fix();
+                            virtual std::vector<String> PossibilitiesAsString();
+                            virtual void                OnSetValue(std::vector<String> vS);
+                            static String Name();
+                        protected:
+                            AudioChannelJack*   pChannel;
+                            std::vector<String> Bindings;
+                    };
                 protected:
-                    AudioChannel* pChannel;
+                    AudioChannelJack(uint ChannelNr, AudioOutputDeviceJack* pDevice) throw (AudioOutputException);
+                    ~AudioChannelJack();
+                    friend class AudioOutputDeviceJack;
+                private:
+                    AudioOutputDeviceJack* pDevice;
+                    jack_port_t*           hJackPort;
+                    uint                   ChannelNr;
+
+                    float* CreateJackPort(uint ChannelNr, AudioOutputDeviceJack* pDevice) throw (AudioOutputException);
+            };
+
+            /** Audio Device Parameter 'NAME'
+             *
+             * Used to assign an arbitrary name to the JACK client of this
+             * audio device.
+             */
+            class ParameterName : public DeviceCreationParameterString {
+                public:
+                    ParameterName();
+                    ParameterName(String s) throw (Exception);
+                    virtual String              Description();
+                    virtual bool                Fix();
+                    virtual bool                Mandatory();
+                    virtual std::map<String,DeviceCreationParameter*> DependsAsParameters();
+                    virtual std::vector<String> PossibilitiesAsString(std::map<String,String> Parameters);
+                    virtual optional<String>    DefaultAsString(std::map<String,String> Parameters);
+                    virtual void                OnSetValue(String s) throw (Exception);
+                    static String Name();
             };
 
             // derived abstract methods from class 'AudioOutputDevice'
             virtual void Play();
             virtual bool IsPlaying();
             virtual void Stop();
-            virtual void AcquireChannels(uint uiChannels);
             virtual uint MaxSamplesPerCycle();
             virtual uint SampleRate();
+            virtual AudioChannel* CreateChannel(uint ChannelNr);
+
 
 	    static String Name();
 
@@ -74,16 +125,14 @@
 
             static String Description();
             static String Version();
-            static std::map<String,DeviceCreationParameter*> AvailableParameters();
 
             int Process(uint Samples);  // FIXME: should be private
         protected:
             AudioOutputDeviceJack(String* AutoConnectPortIDs = NULL, uint AutoConnectPorts = 0);
         private:
-            ConditionServer           csIsPlaying;
-            uint                      uiMaxSamplesPerCycle;
-            jack_client_t*            hJackClient;
-            std::vector<jack_port_t*> hJackPorts;
+            ConditionServer csIsPlaying;
+            uint            uiMaxSamplesPerCycle;
+            jack_client_t*  hJackClient;
     };
 
     // Callback functions for the libjack API