Changeset 545

Timestamp:

08/21/07 08:19:33 (16 years ago)

Author:

ppalmers

Message:

- Remove name parameter from PortInfo? since it's already in Port

Files:

• branches/echoaudio/src/libstreaming/AmdtpPort.h (modified) (2 diffs)
• branches/echoaudio/src/libstreaming/AmdtpPortInfo.h (modified) (2 diffs)
• branches/echoaudio/src/libstreaming/MotuPort.h (modified) (2 diffs)
• branches/echoaudio/src/libstreaming/MotuPortInfo.h (modified) (2 diffs)
• branches/echoaudio/src/libstreaming/Port.cpp (modified) (15 diffs)
• branches/echoaudio/src/libstreaming/Port.h (modified) (3 diffs)

branches/echoaudio/src/libstreaming/AmdtpPort.h

@@ -53 +53 @@
-                   enum E_Formats format)
-    : AudioPort(name, direction),
-name, 
+
-    {};
-
@@ -80 +80 @@
-                   enum E_Formats format)
-        : MidiPort(name, direction),
-name, 
+
-    {};
-

branches/echoaudio/src/libstreaming/AmdtpPortInfo.h

@@ -54 +54 @@
-    };
-
-std::string name,
-name(name), m_
+
+
-    {};
-    virtual ~AmdtpPortInfo() {};
-
-
-    std::string getName() {return m_name;};
-    int getLocation()     {return m_location;};
-    int getPosition()     {return m_position;};
@@ -66 +65 @@
-
-protected:
-    std::string m_name;
-
-    int m_position;
-    int m_location;

branches/echoaudio/src/libstreaming/MotuPort.h

@@ -52 +52 @@
-                   int size)
-    : AudioPort(name, direction),
-name,
+
-    {};
-
@@ -76 +76 @@
-                   int position)
-        : MidiPort(name, direction),
-name, 
+
-    {};
-

branches/echoaudio/src/libstreaming/MotuPortInfo.h

@@ -60 +60 @@
-     * the name parameter is mandatory
-     *
-     * @param name Port name
-     * @param position Start position of port's data in iso event
-     * @param format Format of data in iso event
@@ -66 +65 @@
-     * @return
-     */
-std::string name,
-name(name), m_
+
+
-    {};
-    virtual ~MotuPortInfo() {};
-
-
-    std::string getName() {return m_name;};
-    int getPosition()     {return m_position;};
-    int getSize()         {return m_size;};
-
-protected:
-    std::string m_name;
-
-    int m_position;

branches/echoaudio/src/libstreaming/Port.cpp

@@ -35 +35 @@
-    m_BufferType(E_PointerBuffer),
-    m_disabled(true),
-    m_initialized(false),
-    m_buffersize(0),
-    m_eventsize(0),
@@ -49 +48 @@
-    m_rate_counter(0),
-    m_rate_counter_minimum(0),
-
-
+,
+
-{
-
@@ -63 +62 @@
- */
-bool Port::init() {
-initializ
-already initialized... (%s)\n",m_Name.c_str()
+State != E_Creat
+(%s) not in E_Created state: %d\n",m_Name.c_str(),m_State
-        return false;
-    }
@@ -98 +97 @@
-    }
-
-    m_initialized=true;
-
-    m_eventsize=getEventSize(); // this won't change, so cache it
-
-
+
+
+
-}
-
@@ -112 +110 @@
-};
-
+void Port::show() {
+    debugOutput(DEBUG_LEVEL_VERBOSE,"Name          : %s\n", m_Name.c_str());
+    debugOutput(DEBUG_LEVEL_VERBOSE,"Signal Type   : %d\n", m_SignalType);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"Buffer Type   : %d\n", m_BufferType);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"Enabled?      : %d\n", m_disabled);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"State?        : %d\n", m_State);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"Buffer Size   : %d\n", m_buffersize);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"Event Size    : %d\n", m_eventsize);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"Data Type     : %d\n", m_DataType);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"Port Type     : %d\n", m_PortType);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"Direction     : %d\n", m_Direction);
+    debugOutput(DEBUG_LEVEL_VERBOSE,"Rate Control? : %d\n", m_do_ratecontrol);
+}
-
-void Port::setVerboseLevel(int l) {
@@ -120 +131 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting name to %s for port %s\n",name.c_str(),m_Name.c_str());
-
-initializ
-already initialized... (%s)\n",m_Name.c_str()
+State != E_Creat
+(%s) not in E_Created state: %d\n",m_Name.c_str(),m_State
-        return false;
-    }
@@ -132 +143 @@
-bool Port::setBufferSize(unsigned int newsize) {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting buffersize to %d for port %s\n",newsize,m_Name.c_str());
-initializ
-already initialized... (%s)\n",m_Name.c_str()
+State != E_Creat
+(%s) not in E_Created state: %d\n",m_Name.c_str(),m_State
-        return false;
-    }
@@ -157 +168 @@
-bool Port::setDataType(enum E_DataType d) {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting datatype to %d for port %s\n",(int) d,m_Name.c_str());
-initializ
-already initialized... (%s)\n",m_Name.c_str()
+State != E_Creat
+(%s) not in E_Created state: %d\n",m_Name.c_str(),m_State
-        return false;
-    }
@@ -190 +201 @@
-bool Port::setSignalType(enum E_SignalType s) {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting signaltype to %d for port %s\n",(int)s,m_Name.c_str());
-initializ
-already initialized... (%s)\n",m_Name.c_str()
+State != E_Creat
+(%s) not in E_Created state: %d\n",m_Name.c_str(),m_State
-        return false;
-    }
@@ -223 +234 @@
-bool Port::setBufferType(enum E_BufferType b) {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting buffer type to %d for port %s\n",(int)b,m_Name.c_str());
-initializ
-already initialized... (%s)\n",m_Name.c_str()
+State != E_Creat
+(%s) not in E_Created state: %d\n",m_Name.c_str(),m_State
-        return false;
-    }
@@ -257 +268 @@
-    // If called on an initialised stream but the request isn't for a change silently
-    // allow it (relied on by C API as used by jack backend driver)
-i
+State==E_I
-        return true;
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting external buffer use to %d for port %s\n",(int)b,m_Name.c_str());
-
-initializ
-already initialized... (%s)\n",m_Name.c_str()
+State != E_Creat
+(%s) not in E_Created state: %d\n",m_Name.c_str(),m_State
-        return false;
-    }
@@ -284 +295 @@
-/**
- * Set the external buffer address.
-
+
+
- *
- * @param buff
@@ -296 +308 @@
-// buffer handling api's for ringbuffers
-bool Port::writeEvent(void *event) {
-
+
+
+
+
+
+
+
+
+
+
+
+
-    assert(m_ringbuffer);
+#endif
-
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "Writing event %08X with size %d to port %s\n",*((quadlet_t *)event),m_eventsize, m_Name.c_str());
@@ -305 +329 @@
-
-bool Port::readEvent(void *event) {
+
+#ifdef DEBUG
+    if (m_State != E_Initialized) {
+        debugFatal("Port (%s) not in E_Initialized state: %d\n",m_Name.c_str(),m_State);
+        return false;
+    }
+    
+    if(m_BufferType!=E_RingBuffer) {
+        debugError("operation not allowed on non E_RingBuffer ports\n");
+        show();
+        return false;
+    }
-    assert(m_ringbuffer);
-
+
+
+
-    unsigned int read=ffado_ringbuffer_read(m_ringbuffer, (char *)event, m_eventsize);
-
+
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "Reading event %X with size %d from port %s\n",*((quadlet_t *)event),m_eventsize,m_Name.c_str());
+
+
-    return (read==m_eventsize);
-}
-
-int Port::writeEvents(void *event, unsigned int nevents) {
-
+
+
+
+
+
+
+
+
+
+
+
+
-    assert(m_ringbuffer);
+#endif
+
-
-    unsigned int bytes2write=m_eventsize*nevents;
@@ -338 +391 @@
-
-int Port::readEvents(void *event, unsigned int nevents) {
+
+#ifdef DEBUG
+    if (m_State != E_Initialized) {
+        debugFatal("Port (%s) not in E_Initialized state: %d\n",m_Name.c_str(),m_State);
+        return false;
+    }
+    if(m_BufferType!=E_RingBuffer) {
+        debugError("operation not allowed on non E_RingBuffer ports\n");
+        show();
+        return false;
+    }
-    assert(m_ringbuffer);
+#endif
+
-
-    unsigned int bytes2read=m_eventsize*nevents;

branches/echoaudio/src/libstreaming/Port.h

@@ -270 +270 @@
-    int readEvents(void *event, unsigned int nevents); ///< read multiple events
-
-
-
+
+
+
-protected:
-    std::string m_Name; ///< Port name, [at construction]
@@ -279 +280 @@
-
-    bool m_disabled; ///< is the port disabled?, [anytime]
-    bool m_initialized; ///< is the port initialized? [after init()]
-
-    unsigned int m_buffersize;
@@ -306 +306 @@
-
-    DECLARE_DEBUG_MODULE;
-
+
+
+
+
+
+
+
+
+
+
+
+
-};
-