[FFADO-svn] r2322 - in trunk/libffado/src/libavc: general streamformat

[<tr...@ff...>]

Author: jwoithe
Date: 2013-05-18 03:57:56 -0700 (Sat, 18 May 2013)
New Revision: 2322

Modified:
   trunk/libffado/src/libavc/general/avc_plug.cpp
   trunk/libffado/src/libavc/streamformat/avc_extended_stream_format.h
Log:
libavc: fix wrong format name of stream for digital audio interface.  In libavc component, there is a format of stream named as AM824_IEC60968_3.  But IEC 60968 is for electric lights then IEC 60958 seems to be valid here.  This patch just rename the macro and add no functional changes.  Patch from Takashi Sakamoto.

Modified: trunk/libffado/src/libavc/general/avc_plug.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_plug.cpp	2013-05-17 12:37:50 UTC (rev 2321)
+++ trunk/libffado/src/libavc/general/avc_plug.cpp	2013-05-18 10:57:56 UTC (rev 2322)
@@ -567,7 +567,7 @@
                       ++j )
                 {
                     switch ( compoundStream->m_streamFormatInfos[j]->m_streamFormat ) {
-                    case AVC1394_STREAM_FORMAT_AM824_IEC60968_3:
+                    case AVC1394_STREAM_FORMAT_AM824_IEC60958_3:
                         formatInfo.m_audioChannels +=
                             compoundStream->m_streamFormatInfos[j]->m_numberOfChannels;
                         break;

Modified: trunk/libffado/src/libavc/streamformat/avc_extended_stream_format.h
===================================================================
--- trunk/libffado/src/libavc/streamformat/avc_extended_stream_format.h	2013-05-17 12:37:50 UTC (rev 2321)
+++ trunk/libffado/src/libavc/streamformat/avc_extended_stream_format.h	2013-05-18 10:57:56 UTC (rev 2322)
@@ -58,7 +58,7 @@
 #define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_DONT_CARE              0xFF
 
 
-#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC60968_3                            0x00
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC60958_3                            0x00
 #define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_3                            0x01
 #define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_4                            0x02
 #define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_5                            0x03
@@ -75,7 +75,7 @@
 #define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_SYNC_STREAM                           0x40
 #define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_DONT_CARE                             0xFF
 
-#define AVC1394_STREAM_FORMAT_AM824_IEC60968_3                            0x00
+#define AVC1394_STREAM_FORMAT_AM824_IEC60958_3                            0x00
 #define AVC1394_STREAM_FORMAT_AM824_IEC61937_3                            0x01
 #define AVC1394_STREAM_FORMAT_AM824_IEC61937_4                            0x02
 #define AVC1394_STREAM_FORMAT_AM824_IEC61937_5                            0x03
@@ -200,7 +200,7 @@
     };
 
     enum EFormatHierarchyLevel2 {
-        eFHL2_AM824_IEC60968_3 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC60968_3,
+        eFHL2_AM824_IEC60958_3 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC60958_3,
         eFHL2_AM824_IEC61937_3 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_3,
         eFHL2_AM824_IEC61937_4 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_4,
         eFHL2_AM824_IEC61937_5 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_5,