X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Feyetv.m;h=9d57c9ffc986e64c47eeafdf1b293cab5f656e0b;hb=f5623dec1ca290e9adcbbc34ba4fe3f03a4c2e69;hp=7c68e6f38f221ab927bdb099dbafe2a911f5f536;hpb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;p=vlc

diff --git a/modules/access/eyetv.m b/modules/access/eyetv.m
index 7c68e6f38f..9d57c9ffc9 100644
--- a/modules/access/eyetv.m
+++ b/modules/access/eyetv.m
@@ -2,7 +2,7 @@
  * eyetv.c : Access module to connect to our plugin running within EyeTV
  *****************************************************************************
  * Copyright (C) 2006-2007 the VideoLAN team
- * $Id: eyetv.c 23509 2007-12-09 17:39:28Z courmisch $
+ * $Id$
  *
  * Author: Felix Kühne <fkuehne at videolan dot org>
  *
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_access.h>
 
 #include <vlc_network.h>
@@ -56,14 +57,14 @@ static void Close( vlc_object_t * );
     "-1 for S-Video input, -2 for Composite input" )
 vlc_module_begin();
     set_shortname( "EyeTV" );
-    set_description( _("EyeTV access module") );
+    set_description( N_("EyeTV access module") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 
     add_integer( "eyetv-channel", 0, NULL,
-                 CHANNEL_TEXT, CHANNEL_LONGTEXT, VLC_FALSE );
+                 CHANNEL_TEXT, CHANNEL_LONGTEXT, false );
 
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     add_shortcut( "eyetv" );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -271,9 +272,9 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
         return 0;
 
     i_read = net_Read( p_access, p_sys->eyetvSock, NULL, p_buffer, i_len,
-                       VLC_FALSE );
+                       false );
     if( i_read == 0 )
-        p_access->info.b_eof = VLC_TRUE;
+        p_access->info.b_eof = true;
     else if( i_read > 0 )
         p_access->info.i_pos += i_read;
 
@@ -285,7 +286,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
  *****************************************************************************/
 static int Control( access_t *p_access, int i_query, va_list args )
 {/*
-    vlc_bool_t   *pb_bool;
+    bool   *pb_bool;
     int          *pi_int;
     int64_t      *pi_64;