Changeset 475

Timestamp:

05/23/07 14:20:01 (16 years ago)

Author:

ppalmers

Message:

- Add Generic AV/C device

Currently this is a placeholder

Files:

• branches/echoaudio/configure.ac (modified) (4 diffs)
• branches/echoaudio/src/devicemanager.cpp (modified) (10 diffs)
• branches/echoaudio/src/devicemanager.h (modified) (1 diff)
• branches/echoaudio/src/genericavc (added)
• branches/echoaudio/src/genericavc/avc_avdevice.cpp (added)
• branches/echoaudio/src/genericavc/avc_avdevice.h (added)
• branches/echoaudio/src/Makefile.am (modified) (2 diffs)
• branches/echoaudio/tests/test-ffado.cpp (modified) (2 diffs)

branches/echoaudio/configure.ac

@@ -217 +217 @@
-[build_bebob=true])
-
+dnl --- Build Generic AV/C code (Apple class driver compatible)?
+
+AC_ARG_ENABLE(generic-avc,
+    AC_HELP_STRING([--enable-generic-avc],
+                   [build Generic AV/C support (default=yes)]),
+[case "${enableval}" in
+  yes) build_genericavc=true;;
+  no)  build_genericavc=false;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-generic-avc) ;;
+esac],
+[build_genericavc=true])
+
-dnl --- Build Motu code?
-
@@ -313 +325 @@
-if test "${build_all}" = true; then
-    build_bebob=true
+    build_genericavc=true
-    build_motu=true
-    build_dice=true
@@ -329 +342 @@
-fi;
-
+if test "${build_genericavc}" = true; then
+   CFLAGS="$CFLAGS -DENABLE_GENERICAVC"
+   CXXFLAGS="$CXXFLAGS -DENABLE_GENERICAVC" 
+   supported_devices="${supported_devices}GenericAVC  "
+   build_amdtp=true
+fi;
+
-if test "${build_motu}" = true; then
-   CFLAGS="$CFLAGS -DENABLE_MOTU"
@@ -366 +386 @@
-
-AM_CONDITIONAL(BUILD_BEBOB,test "${build_bebob}" = true)
+AM_CONDITIONAL(BUILD_GENERICAVC,test "${build_genericavc}" = true)
-AM_CONDITIONAL(BUILD_MOTU,test "${build_motu}" = true)
-AM_CONDITIONAL(BUILD_DICE,test "${build_dice}" = true)

branches/echoaudio/src/devicemanager.cpp

@@ -45 +45 @@
-#endif
-
+#ifdef ENABLE_GENERICAVC
+    #include "genericavc/avc_avdevice.h"
+#endif
+
-#ifdef ENABLE_BOUNCE
-    #include "bounce/bounce_avdevice.h"
@@ -74 +78 @@
-    , m_1394Service( 0 )
-    , m_oscServer( NULL )
-    , m_verboseLevel( DEBUG_LEVEL_NORMAL )
-{
-    addOption(Util::OptionContainer::Option("slaveMode",false));
@@ -100 +103 @@
-DeviceManager::setVerboseLevel(int l)
-{
-m_verboseLevel=l
+debugOutput( DEBUG_LEVEL_NORMAL, "Setting verbose level to %d...\n", l )
-    setDebugLevel(l);
-
@@ -167 +170 @@
-    }
-
-m_verboseLevel
+getDebugLevel()
-    return true;
-}
@@ -183 +186 @@
-    }
-
-m_verboseLevel
+getDebugLevel()
-
-    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
@@ -231 +234 @@
-                             nodeId );
-
-m_verboseLevel
+getDebugLevel()
-
-                if ( !avDevice->discover() ) {
@@ -254 +257 @@
-                }
-
-m_verboseLevel
+getDebugLevel()
-                    avDevice->showDevice();
-                }
@@ -294 +297 @@
-                         nodeId );
-
-m_verboseLevel
+getDebugLevel()
-
-            if ( !avDevice->discover() ) {
@@ -305 +308 @@
-                debugError( "setting Id failed\n" );
-            }
-m_verboseLevel
+getDebugLevel()
-                avDevice->showDevice();
-            }
@@ -325 +328 @@
-    if ( BeBoB::AvDevice::probe( *configRom.get() ) ) {
-        return new BeBoB::AvDevice( configRom, *m_1394Service, id );
+    }
+#endif
+
+#ifdef ENABLE_GENERICAVC
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Trying Generic AV/C...\n" );
+    if ( GenericAVC::AvDevice::probe( *configRom.get() ) ) {
+        return new GenericAVC::AvDevice( configRom, *m_1394Service, id );
-    }
-#endif

branches/echoaudio/src/devicemanager.h

@@ -89 +89 @@
-    void setVerboseLevel(int l);
-private:
-    int m_verboseLevel;
-    DECLARE_DEBUG_MODULE;
-};

branches/echoaudio/src/Makefile.am

@@ -139 +139 @@
-            maudio/maudio_avdevice.cpp
-
+genericavc_src = \
+            genericavc/avc_avdevice.cpp \
+            genericavc/avc_avdevice.h
+
-motu_src = \
-            motu/motu_avdevice.cpp \
@@ -216 +220 @@
-endif
-
+if BUILD_GENERICAVC
+libffado_la_SOURCES += $(genericavc_src)
+bin_PROGRAMS += $(genericavc_bin)
+noinst_PROGRAMS += $(genericavc_noinst)
+nobase_dist_pkgdata_DATA += $(genericavc_pkgdata)
+endif
+
-if BUILD_BOUNCE
-libffado_la_SOURCES += $(bounce_src)

branches/echoaudio/tests/test-ffado.cpp

@@ -224 +224 @@
-            return -1;
-        }
+        if ( arguments.verbose ) {
+            m_deviceManager->setVerboseLevel(arguments.verbose);
+        }
-        if ( !m_deviceManager->initialize( arguments.port ) ) {
-            fprintf( stderr, "Could not initialize device manager\n" );
@@ -251 +254 @@
-            fprintf( stderr, "Could not allocate device manager\n" );
-            return -1;
+        }
+        if ( arguments.verbose ) {
+            m_deviceManager->setVerboseLevel(arguments.verbose);
-        }
-        if ( !m_deviceManager->initialize( arguments.port ) ) {