Changeset 741

Timestamp:

11/28/07 14:40:32 (15 years ago)

Author:

ppalmers

Message:

Fixes #54

Files:

• trunk/libffado/src/libavc/general/avc_plug.cpp (modified) (4 diffs)

trunk/libffado/src/libavc/general/avc_plug.cpp

@@ -1246 +1246 @@
-    debugOutputShort(DEBUG_LEVEL_VERBOSE, "\n");
-
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tChannel info:\n");
+    for ( Plug::ClusterInfoVector::const_iterator it = m_clusterInfos.begin();
+          it != m_clusterInfos.end();
+          ++it )
+    {
+        const Plug::ClusterInfo* clusterInfo = &( *it );
+
+        debugOutput(DEBUG_LEVEL_VERBOSE, "         Cluster %s (idx=%2d, type=0x%02X, ch=%2d, format=0x%02X)\n",
+            clusterInfo->m_name.c_str(), clusterInfo->m_portType, clusterInfo->m_nrOfChannels, clusterInfo->m_streamFormat);
+        Plug::ChannelInfoVector channelInfos = clusterInfo->m_channelInfos;
+        for ( Plug::ChannelInfoVector::const_iterator it = channelInfos.begin();
+              it != channelInfos.end();
+              ++it )
+        {
+            const Plug::ChannelInfo* channelInfo = &( *it );
+            debugOutput(DEBUG_LEVEL_VERBOSE, "           Channel %s (pos=0x%02X, loc=0x%02X)\n",
+                channelInfo->m_name.c_str(), channelInfo->m_streamPosition, channelInfo->m_location);
+        }
+    }
+
-    flushDebugOutput();
-}
@@ -1412 +1432 @@
-        result &= ser.write( strstrm.str() + "/m_location", info.m_location );
-        result &= ser.write( strstrm.str() + "/m_name", info.m_name );
+        i++;
-    }
-
@@ -1473 +1494 @@
-        result &= serializeChannelInfos( strstrm.str() + "/m_channelInfo", ser, info );
-        result &= ser.write( strstrm.str() + "/m_streamFormat", info.m_streamFormat );
-
+
-    }
-
@@ -1536 +1557 @@
-        result &= ser.write( strstrm.str() + "/m_midiChannels", info.m_midiChannels );
-        result &= ser.write( strstrm.str() + "/m_index", info.m_index );
+        i++;
-    }
-    return result;