Commit 16c54bad authored by Jean-Marc Dressler's avatar Jean-Marc Dressler

. correction d'un flag inexistant dans input_file

 . d�but du support son BeOS
 . fix d'un warning dans ac3_exponent.c
parent 74daded6
...@@ -324,7 +324,8 @@ FORCE: ...@@ -324,7 +324,8 @@ FORCE:
vlc: $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) vlc: $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
ifeq ($(SYS),beos) ifeq ($(SYS),beos)
$(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) -Xlinker -soname=_APP_ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(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 else
$(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
endif endif
...@@ -367,6 +368,9 @@ else ...@@ -367,6 +368,9 @@ else
$(CC) $(CCFLAGS) $(CFLAGS) -laudiofile -lesd -shared -o $@ $< $(CC) $(CCFLAGS) $(CFLAGS) -laudiofile -lesd -shared -o $@ $<
endif endif
plugins/aout/aout_beos.so: %.so: %.cpp
$(CC) $(LCFLAGS) $(CCFLAGS) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $< plugins/_APP_
# video plugins # video plugins
plugins/intf/intf_dummy.so plugins/vout/vout_dummy.so \ plugins/intf/intf_dummy.so plugins/vout/vout_dummy.so \
plugins/intf/intf_fb.so plugins/vout/vout_fb.so: %.so: %.c plugins/intf/intf_fb.so plugins/vout/vout_fb.so: %.so: %.c
......
...@@ -23,7 +23,14 @@ ...@@ -23,7 +23,14 @@
#include <stdio.h> /* "intf_msg.h" */ #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_decoder.h"
#include "ac3_bit_stream.h" #include "ac3_bit_stream.h"
#include "ac3_internal.h" #include "ac3_internal.h"
......
...@@ -298,7 +298,7 @@ int file_next( options_t *options ) ...@@ -298,7 +298,7 @@ int file_next( options_t *options )
fprintf( stderr, "Playing file %s\n", fprintf( stderr, "Playing file %s\n",
options->playlist[options->i_list_index] ); options->playlist[options->i_list_index] );
return ( options->in = open( options->playlist[options->i_list_index], return ( options->in = open( options->playlist[options->i_list_index],
O_RDONLY | O_NDELAY ) ); O_RDONLY | O_NONBLOCK ) );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment