*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* 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 */
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;
pFilter->Release();
}
- return *ppPin ? S_OK : E_FAIL;
+ return *ppPin ? S_OK : E_FAIL;
}
/*****************************************************************************
pFilter->Release();
}
- return fOK ? S_OK : E_FAIL;
+ return fOK ? S_OK : E_FAIL;
}
/*****************************************************************************
{
// 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
// reset to first pin for complete loop iteration
inputPinIndex = 0;
}
- }
-
+ }
+
//
// for all input pins
//
// Can we route it?
if( FAILED(pXbar->CanRoute(outputPinIndex, inputPinIndex)) ) continue;
-
-
+
+
IPin *pPin;
if( FAILED(GetCrossbarIPinAtIndex( pXbar, inputPinIndex,
TRUE, &pPin)) ) continue;
p_sys->crossbar_routes[depth].AudioInputIndex = inputPinIndexRelated;
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,
+ msg_Dbg( p_this, "crossbar at depth %d, found route for "
+ "output %ld (type %ld) to input %ld (type %ld)", depth,
outputPinIndex, outputPinPhysicalType, inputPinIndex,
inputPinPhysicalType );