[mythtv] [DVB][PATCH] Handle multiple audio streams with PS recorder

[Jesper Sörensen]

The attached patch will remove a hard coded stream id override and allow 
the PS recorder to record multiple audio tracks, like we already do in 
TS mode.

-------------- next part --------------
Index: libs/libmythtv/dvbrecorder.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/dvbrecorder.cpp,v
retrieving revision 1.45
diff -u -r1.45 dvbrecorder.cpp
--- libs/libmythtv/dvbrecorder.cpp	23 Feb 2005 05:04:36 -0000	1.45
+++ libs/libmythtv/dvbrecorder.cpp	25 Feb 2005 15:39:22 -0000
@@ -421,35 +423,6 @@
                 continue; // Ignore this stream
         }
 
-        if (!_record_transport_stream_option)
-        {
-            // The MPEG PS decoder in Myth currently only handles one stream
-            // of each type, so make sure we don't already have one
-            switch ((*es).Type)
-            {
-                case ES_TYPE_VIDEO_MPEG1:
-                case ES_TYPE_VIDEO_MPEG2:
-                    if (flagged.contains(ES_TYPE_VIDEO_MPEG1) || flagged.contains(ES_TYPE_VIDEO_MPEG2))
-                        continue; // Ignore this stream
-                    break;
-
-                case ES_TYPE_AUDIO_MPEG1:
-                case ES_TYPE_AUDIO_MPEG2:
-                    if (flagged.contains(ES_TYPE_AUDIO_MPEG1) || flagged.contains(ES_TYPE_AUDIO_MPEG2))
-                        continue; // Ignore this stream
-                    break;
-
-                case ES_TYPE_AUDIO_AC3:
-                    if (flagged.contains(ES_TYPE_AUDIO_AC3))
-                        continue; // Ignore this stream
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-
         if (Languages.isEmpty() // No specific language wanted
             || (*es).Language.isEmpty() // Component has no language
             || Languages.contains((*es).Language)) // This language is wanted!
@@ -745,7 +718,6 @@
             case PRIVATE_STREAM1:
                 break;
             case AUDIO_STREAM_S ... AUDIO_STREAM_E:
-                buffer[3] = 0xc0; // fix audio ID to 0xC0
                 break;
 
             case VIDEO_STREAM_S ... VIDEO_STREAM_E:
@@ -757,7 +729,6 @@
                 unsigned int state = 0xFFFFFFFF, v = 0;
                 int prvcount = -1;
 
-                buffer[3] = 0xe0; // fix video ID to 0xE0
                 while (bufptr < &buffer[pos] + datalen)
                 {
                     if (++prvcount < 3)