. correction d'un flag inexistant dans input_file

 . d�but du support son BeOS
 . fix d'un warning dans ac3_exponent.c

diff --git a/Makefile.in b/Makefile.in
index 695a808eaa56b872f96bb1cc9a72219d2330e7a9..096828fb9d14a1626be20ffc308d655e0f57f6eb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -324,7 +324,8 @@ FORCE:
 vlc: $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
 ifeq ($(SYS),beos)
        $(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) -Xlinker -soname=_APP_ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
-#      ln -s ../vlc ./plugins/_APP_
+       rm -f ./plugins/_APP_
+       ln -s ../vlc ./plugins/_APP_
 else
        $(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)   
 endif
@@ -367,6 +368,9 @@ else
        $(CC) $(CCFLAGS) $(CFLAGS) -laudiofile -lesd -shared -o $@ $<
 endif
 
+plugins/aout/aout_beos.so: %.so: %.cpp
+       $(CC) $(LCFLAGS) $(CCFLAGS) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $< plugins/_APP_
+               
 # video plugins
 plugins/intf/intf_dummy.so plugins/vout/vout_dummy.so \
        plugins/intf/intf_fb.so plugins/vout/vout_fb.so: %.so: %.c

diff --git a/src/ac3_decoder/ac3_exponent.c b/src/ac3_decoder/ac3_exponent.c
index 922a92b4473d5cd73f79c2ed3303d52236342163..68c24517a2fabe026d8427a9eba5399069dd958e 100644 (file)
--- a/src/ac3_decoder/ac3_exponent.c
+++ b/src/ac3_decoder/ac3_exponent.c
@@ -23,7 +23,14 @@
 
 #include <stdio.h>                                           /* "intf_msg.h" */
 
-#include "int_types.h"
+#include "config.h"
+#include "common.h"
+#include "threads.h"
+#include "mtime.h"
+#include "plugins.h"
+
+#include "intf_msg.h"
+
 #include "ac3_decoder.h"
 #include "ac3_bit_stream.h"
 #include "ac3_internal.h"

diff --git a/src/input/input_file.c b/src/input/input_file.c
index 9f5b9ea8fb5427319302fc8b56224d498824f47b..c9b393d087c3976f882a566d6d14b51e835647cc 100644 (file)
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -298,7 +298,7 @@ int file_next( options_t *options )
         fprintf( stderr, "Playing file %s\n",
                  options->playlist[options->i_list_index] );
         return ( options->in = open( options->playlist[options->i_list_index],
-                                     O_RDONLY | O_NDELAY ) );
+                                     O_RDONLY | O_NONBLOCK ) );
     }
 }