Merge remote-tracking branch 'remotes/origin/BUG-3655_Adaptec_hacks_i…

…n_TV_server_analog_code' into 1.3.0Alpha
MediaPortal · Jun 5, 2012 · e00e8e4 · e00e8e4
2 parents ce46699 + bcd4d2c
commit e00e8e4
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Components/Encoder.cs b/TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Components/Encoder.cs
@@ -1942,9 +1942,18 @@ private bool AddMpegMuxer(IFilterGraph2 _graphBuilder, Capture _capture)
         }
         _pinVideoConnected = true;
         Log.Log.WriteFile("analog: connected pinvideo->mpeg muxer");
+
+
+        //----------------------------------------------------------------
+        // Adaptec hack removed for information gathering purposes in
+        // 1.3a. If somebody complains about an Adaptec tuner not working
+        // then we will finally have the chance to find out which hardware
+        // is affected and fix it properly.
+        // --mm1352000
+        //----------------------------------------------------------------
         // Some Adaptec devices use the LPCM pin for audio so we check this can connect if applicable.
         // Note that this does *not* apply to the Adaptec AVC-3610.
-        bool isAdaptec = false;
+        /*bool isAdaptec = false;
         if (!_capture.VideoCaptureDevicePath.ToLower().StartsWith(@"@device:pnp:\\?\usb#vid_03f3&pid_0091#") && // Adaptec AVC-3610 tuner 1
             !_capture.VideoCaptureDevicePath.ToLower().StartsWith(@"@device:pnp:\\?\usb#vid_03f3&pid_0093#") && // Adaptec AVC-3610 tuner 2
             (
@@ -1968,15 +1977,15 @@ private bool AddMpegMuxer(IFilterGraph2 _graphBuilder, Capture _capture)
           Log.Log.WriteFile("analog: AddMpegMuxer, connected pinLPCM->mpeg muxer");
         }
         else
-        {
+        {*/
           Log.Log.WriteFile("analog:connect pinaudio {0} ->mpeg muxer", FilterGraphTools.LogPinInfo(_pinAudio));
           if (!FilterGraphTools.ConnectPin(_graphBuilder, _pinAudio, _filterMpegMuxer, 1))
           {
             Log.Log.WriteFile("analog:AddMpegMuxer, unable to connect pinaudio->mpeg muxer");
             throw new TvException("Unable to connect pins");
           }
           Log.Log.WriteFile("analog:AddMpegMuxer, connected pinaudio->mpeg muxer");
-        }
+        //}
         return true;
       }
       catch (Exception ex)