Removes trailing spaces. Removes tabs.

[vlc] / modules / codec / cmml / cmml.c

diff --git a/modules/codec/cmml/cmml.c b/modules/codec/cmml/cmml.c
index 30e272ed09fcaaeaf6df471088ea827eb88f5879..7d8d9b1f82caadcafa5eecf41d02b7e3bc46587f 100644 (file)
--- a/modules/codec/cmml/cmml.c
+++ b/modules/codec/cmml/cmml.c
@@ -3,7 +3,7 @@
  *****************************************************************************
  * Copyright (C) 2003-2004 Commonwealth Scientific and Industrial Research
  *                         Organisation (CSIRO) Australia
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
  *
  * $Id$
  *
@@ -21,20 +21,18 @@
  *
  * 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 <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/intf.h>
-
-#include <osd.h>
-
-#include "charset.h"
-
+#include <vlc_input.h>
+#include <vlc_codec.h>
+#include <vlc_osd.h>
+#include <vlc_charset.h>
+#include <vlc_interface.h>
 #include "xtag.h"
 
 #undef  CMML_DEBUG
@@ -98,7 +96,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     p_dec->pf_decode_sub = DecodeBlock;
 
 #ifdef CMML_DEBUG
-    msg_Dbg( p_dec, "I am at %p", p_dec );
+    msg_Dbg( p_dec, "i am at %p", p_dec );
 #endif
 
     /* Allocate the memory needed to store the decoder's structure */
@@ -128,7 +126,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     vlc_object_release( p_input );
 
     /* initialise the CMML responder interface */
-    p_sys->p_intf = intf_Create( p_dec, "cmml" );
+    p_sys->p_intf = intf_Create( p_dec, "cmml", 0, NULL );
     p_sys->p_intf->b_block = VLC_FALSE;
     intf_RunThread( p_sys->p_intf );
 
@@ -229,7 +227,7 @@ static void ParseText( decoder_t *p_dec, block_t *p_block )
 #ifdef CMML_DEBUG
     msg_Dbg( p_dec, "psz_cmml is \"%s\"", psz_cmml );
 #endif
-    
+ 
     /* Parse the <clip> part of the CMML */
     p_clip_parser = xtag_new_parse( psz_cmml, p_block->i_buffer );
     if( !p_clip_parser )
@@ -262,7 +260,7 @@ static void ParseText( decoder_t *p_dec, block_t *p_block )
     if( psz_url )
     {
         char *psz_tmp = strdup( psz_url );
-        
+ 
         val.p_address = psz_tmp;
         if( var_Set( p_dec, "psz-current-anchor-url", val ) != VLC_SUCCESS )
         {