Removes trailing spaces. Removes tabs.

[vlc] / modules / access / dshow / crossbar.cpp

diff --git a/modules/access/dshow/crossbar.cpp b/modules/access/dshow/crossbar.cpp
index 0bc31763e3d78eeffa08f6be3a26700c4572ec2d..6fb5908174736cb55bb00c1a8e3df3b25f2b2399 100644 (file)
--- a/modules/access/dshow/crossbar.cpp
+++ b/modules/access/dshow/crossbar.cpp
@@ -24,13 +24,9 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/vout.h>
+#include <vlc_vout.h>
 
 #ifndef _MSC_VER
     /* Work-around a bug in w32api-2.5 */
@@ -74,13 +70,13 @@ static HRESULT GetCrossbarIPinAtIndex( IAMCrossbar *pXbar, LONG PinIndex,
 
     if( pXbar->QueryInterface(IID_IBaseFilter, (void **)&pFilter) == S_OK )
     {
-        if( SUCCEEDED(pFilter->EnumPins(&pins)) ) 
+        if( SUCCEEDED(pFilter->EnumPins(&pins)) )
         {
             LONG i = 0;
-            while( pins->Next(1, &pP, &n) == S_OK ) 
+            while( pins->Next(1, &pP, &n) == S_OK )
             {
                 pP->Release();
-                if( i == TrueIndex ) 
+                if( i == TrueIndex )
                 {
                     *ppPin = pP;
                     break;
@@ -92,7 +88,7 @@ static HRESULT GetCrossbarIPinAtIndex( IAMCrossbar *pXbar, LONG PinIndex,
         pFilter->Release();
     }
 
-    return *ppPin ? S_OK : E_FAIL; 
+    return *ppPin ? S_OK : E_FAIL;
 }
 
 /*****************************************************************************
@@ -136,7 +132,7 @@ static HRESULT GetCrossbarIndexFromIPin( IAMCrossbar * pXbar, LONG * PinIndex,
         pFilter->Release();
     }
 
-    return fOK ? S_OK : E_FAIL; 
+    return fOK ? S_OK : E_FAIL;
 }
 
 /*****************************************************************************
@@ -207,11 +203,11 @@ HRESULT FindCrossbarRoutes( vlc_object_t *p_this, access_sys_t *p_sys,
             {
                 // remember connector type
                 physicalType = inputPinPhysicalType;
-                
-                msg_Dbg( p_this, "found existing route for ouput %ld (type %ld) to input %ld (type %ld)",
+ 
+                msg_Dbg( p_this, "found existing route for output %ld (type %ld) to input %ld (type %ld)",
                          outputPinIndex, outputPinPhysicalType, inputPinIndex,
                          inputPinPhysicalType );
-                         
+ 
                 // fall through to for loop, note 'inputPinIndex' is set to the pin we are looking for
                 // hence, loop iteration should not wind back
 
@@ -221,8 +217,8 @@ HRESULT FindCrossbarRoutes( vlc_object_t *p_this, access_sys_t *p_sys,
             // reset to first pin for complete loop iteration
             inputPinIndex = 0;
         }
-    }                  
-         
+    }
+ 
     //
     // for all input pins
     //
@@ -236,8 +232,8 @@ HRESULT FindCrossbarRoutes( vlc_object_t *p_this, access_sys_t *p_sys,
 
         // Can we route it?
         if( FAILED(pXbar->CanRoute(outputPinIndex, inputPinIndex)) ) continue;
-            
-   
+ 
+ 
         IPin *pPin;
         if( FAILED(GetCrossbarIPinAtIndex( pXbar, inputPinIndex,
                                            TRUE, &pPin)) ) continue;
@@ -260,7 +256,7 @@ HRESULT FindCrossbarRoutes( vlc_object_t *p_this, access_sys_t *p_sys,
             p_sys->crossbar_routes[depth].AudioOutputIndex = outputPinIndexRelated;
 
             msg_Dbg( p_this, "crossbar at depth %d, found route for "
-                     "ouput %ld (type %ld) to input %ld (type %ld)", depth,
+                     "output %ld (type %ld) to input %ld (type %ld)", depth,
                      outputPinIndex, outputPinPhysicalType, inputPinIndex,
                      inputPinPhysicalType );