Headers for newer libdvdread have moved :D

[vlc] / modules / access / dvdnav.c

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index f9df8aa02e50126b081aca02a28ad932b52c8209..be204f7249b20a3a2f5b79855d3c550e595d58fe 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -29,10 +29,12 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
 #include <vlc_demux.h>
+#include <vlc_charset.h>
 
 #include <vlc_interface.h>
 
@@ -50,7 +52,7 @@
 #endif
 
 #include "vlc_keys.h"
-#include "iso_lang.h"
+#include "vlc_iso_lang.h"
 
 /* FIXME we should find a better way than including that */
 #include "../../src/text/iso-639_def.h"
@@ -82,8 +84,8 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_shortname( _("DVD with menus") );
-    set_description( _("DVDnav Input") );
+    set_shortname( N_("DVD with menus") );
+    set_description( N_("DVDnav Input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT,
@@ -189,7 +191,7 @@ static int Open( vlc_object_t *p_this )
         }
     }
     else
-        psz_name = strdup( p_demux->psz_path );
+        psz_name = ToLocaleDup( p_demux->psz_path );
 
 #ifdef WIN32
     if( psz_name[0] && psz_name[1] == ':' &&
@@ -730,11 +732,11 @@ static int Demux( demux_t *p_demux )
         msg_Dbg( p_demux, "DVDNAV_CELL_CHANGE" );
         msg_Dbg( p_demux, "     - cellN=%d", event->cellN );
         msg_Dbg( p_demux, "     - pgN=%d", event->pgN );
-        msg_Dbg( p_demux, "     - cell_length="I64Fd, event->cell_length );
-        msg_Dbg( p_demux, "     - pg_length="I64Fd, event->pg_length );
-        msg_Dbg( p_demux, "     - pgc_length="I64Fd, event->pgc_length );
-        msg_Dbg( p_demux, "     - cell_start="I64Fd, event->cell_start );
-        msg_Dbg( p_demux, "     - pg_start="I64Fd, event->pg_start );
+        msg_Dbg( p_demux, "     - cell_length=%"PRId64, event->cell_length );
+        msg_Dbg( p_demux, "     - pg_length=%"PRId64, event->pg_length );
+        msg_Dbg( p_demux, "     - pgc_length=%"PRId64, event->pgc_length );
+        msg_Dbg( p_demux, "     - cell_start=%"PRId64, event->cell_start );
+        msg_Dbg( p_demux, "     - pg_start=%"PRId64, event->pg_start );
 
         /* Store the lenght in time of the current PGC */
         p_sys->i_pgc_length = event->pgc_length / 90 * 1000;
@@ -1222,7 +1224,7 @@ static int EventThread( vlc_object_t *p_this )
     demux_sys_t    *p_sys = p_ev->p_demux->p_sys;
     vlc_object_t   *p_vout = NULL;
 
-    vlc_mutex_init( p_ev, &p_ev->lock );
+    vlc_mutex_init( &p_ev->lock );
     p_ev->b_moved   = false;
     p_ev->b_clicked = false;
     p_ev->i_key_action = 0;
@@ -1241,9 +1243,6 @@ static int EventThread( vlc_object_t *p_this )
         {
             pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
 
-            vlc_value_t valk;
-            int i;
-
             vlc_mutex_lock( &p_ev->lock );
             switch( p_ev->i_key_action )
             {