From d32bf98070e71e45060c45ba96418bf40e584674 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 22 Jun 2011 13:48:31 +0000
Subject: cleanup: tvi_dshow: add "static", fix printf format

tvi_dshow: Mark functions not used outside of the file as static.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33706 b3059339-0415-0410-9bf9-f77b7e298cf2

tvi_dshow: Adjust mp_msg printf conversion specifier to avoid warnings

stream/tvi_dshow.c:2807: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'long unsigned int'
stream/tvi_dshow.c:2821: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'long unsigned int'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33710 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/tvi_dshow.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'stream')

diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c
index 3b4535ac8c..3e17d9cb99 100644
--- a/stream/tvi_dshow.c
+++ b/stream/tvi_dshow.c
@@ -505,7 +505,9 @@ static DEFINE_GUID(MEDIATYPE_VBI,   0xf72a76e1, 0xeb0a, 0x11d0, 0xac, 0xe4, 0x00
 *  Methods, called only from this file
 *---------------------------------------------------------------------------------------*/
 
-void set_buffer_preference(int nDiv,WAVEFORMATEX* pWF,IPin* pOutPin,IPin* pInPin){
+static void set_buffer_preference(int nDiv, WAVEFORMATEX *pWF,
+                                  IPin *pOutPin, IPin *pInPin)
+{
     ALLOCATOR_PROPERTIES prop;
     IAMBufferNegotiation* pBN;
     HRESULT hr;
@@ -594,9 +596,10 @@ static long STDCALL CSampleGrabberCB_Release(ISampleGrabberCB * This)
 }
 
 
-HRESULT STDCALL CSampleGrabberCB_BufferCB(ISampleGrabberCB * This,
-					  double SampleTime,
-					  BYTE * pBuffer, long lBufferLen)
+static HRESULT STDCALL CSampleGrabberCB_BufferCB(ISampleGrabberCB *This,
+                                                 double SampleTime,
+                                                 BYTE *pBuffer,
+                                                 long lBufferLen)
 {
     CSampleGrabberCB *this = (CSampleGrabberCB *) This;
     grabber_ringbuffer_t *rb = this->pbuf;
@@ -628,9 +631,9 @@ HRESULT STDCALL CSampleGrabberCB_BufferCB(ISampleGrabberCB * This,
 }
 
 /// wrapper. directshow does the same when BufferCB callback is requested
-HRESULT STDCALL CSampleGrabberCB_SampleCB(ISampleGrabberCB * This,
-					  double SampleTime,
-					  LPMEDIASAMPLE pSample)
+static HRESULT STDCALL CSampleGrabberCB_SampleCB(ISampleGrabberCB *This,
+                                                 double SampleTime,
+                                                 LPMEDIASAMPLE pSample)
 {
     char* buf;
     long len;
@@ -2800,7 +2803,9 @@ static int init(priv_t * priv)
         hr = init_chain_common(priv->pBuilder, priv->chains[1]);
         if(FAILED(hr))
         {
-            mp_msg(MSGT_TV, MSGL_V, "tvi_dshow: Unable to initialize audio chain (Error:0x%x). Audio disabled\n", (unsigned long)hr);
+            mp_msg(MSGT_TV, MSGL_V,
+                   "tvi_dshow: Unable to initialize audio chain (Error:0x%lx). Audio disabled\n",
+                   (unsigned long)hr);
             priv->chains[1]->arpmt=calloc(1, sizeof(AM_MEDIA_TYPE*));
             priv->chains[1]->arStreamCaps=calloc(1, sizeof(void*));
         }
@@ -2814,7 +2819,9 @@ static int init(priv_t * priv)
         hr = init_chain_common(priv->pBuilder, priv->chains[2]);
         if(FAILED(hr))
         {
-            mp_msg(MSGT_TV, MSGL_V, "tvi_dshow: Unable to initialize VBI chain (Error:0x%x). Teletext disabled\n", (unsigned long)hr);
+            mp_msg(MSGT_TV, MSGL_V,
+                   "tvi_dshow: Unable to initialize VBI chain (Error:0x%lx). Teletext disabled\n",
+                   (unsigned long)hr);
             priv->chains[2]->arpmt=calloc(1, sizeof(AM_MEDIA_TYPE*));
             priv->chains[2]->arStreamCaps=calloc(1, sizeof(void*));
         }
-- 
cgit v1.2.3