Skip to content

V
vlc
Commit ba61d25c authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

 * Updated version number to 0.2.62. Release tonight.

 * DVD plugin is still non-functional when you don't have DVD ioctls,
   but at least it compiles under BeOS as well.
 * Minor cosmetic changes here and there.
parent fc04df0b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 164 additions and 176 deletions
Makefile.in
View file @ ba61d25c
...@@ -323,6 +323,10 @@ PLUGIN_GNOME = plugins/gnome/gnome.o \ ...@@ -323,6 +323,10 @@ PLUGIN_GNOME = plugins/gnome/gnome.o \
plugins/gnome/gnome_interface.o \ plugins/gnome/gnome_interface.o \
plugins/gnome/gnome_support.o plugins/gnome/gnome_support.o
PLUGIN_KDE = plugins/kde/kde.o \
plugins/kde/intf_kde.o \
plugins/kde/kvlc.o
PLUGIN_IDCT = plugins/idct/idct.o \ PLUGIN_IDCT = plugins/idct/idct.o \
plugins/idct/idct_common.o plugins/idct/idct_common.o
...@@ -414,7 +418,8 @@ NONSTD_PLUGIN_OBJ = \ ...@@ -414,7 +418,8 @@ NONSTD_PLUGIN_OBJ = \
$(PLUGIN_GNOME) $(PLUGIN_GNOME)
NONSTD_CPP_PLUGIN_OBJ = \ NONSTD_CPP_PLUGIN_OBJ = \
$(PLUGIN_BEOS) $(PLUGIN_BEOS) \
$(PLUGIN_KDE)
# #
# Other lists of files # Other lists of files
...@@ -582,6 +587,11 @@ $(PLUGIN_GLIDE): %.o: .dep/%.d ...@@ -582,6 +587,11 @@ $(PLUGIN_GLIDE): %.o: .dep/%.d
$(PLUGIN_GLIDE): %.o: %.c $(PLUGIN_GLIDE): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $< $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $<
$(PLUGIN_KDE): %.o: Makefile.dep
$(PLUGIN_KDE): %.o: .dep/%.dpp
$(PLUGIN_KDE): %.o: %.cpp
$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/kde -I/usr/include/qt -fno-rtti -c -o $@ $<
$(PLUGIN_BEOS): %.o: Makefile.dep $(PLUGIN_BEOS): %.o: Makefile.dep
$(PLUGIN_BEOS): %.o: .dep/%.dpp $(PLUGIN_BEOS): %.o: .dep/%.dpp
$(PLUGIN_BEOS): %.o: %.cpp $(PLUGIN_BEOS): %.o: %.cpp
...@@ -617,6 +627,9 @@ endif ...@@ -617,6 +627,9 @@ endif
lib/dsp.so: $(PLUGIN_DSP) lib/dsp.so: $(PLUGIN_DSP)
$(CC) $(PCFLAGS) -shared -o $@ $^ $(CC) $(PCFLAGS) -shared -o $@ $^
lib/kde.so: $(PLUGIN_KDE)
$(CC) $(PCFLAGS) -shared -o $@ $^ -lkdeui -lkdecore -lqt -ldl
lib/alsa.so: $(PLUGIN_ALSA) lib/alsa.so: $(PLUGIN_ALSA)
$(CC) $(PCFLAGS) -shared -o $@ $^ -lasound $(CC) $(PCFLAGS) -shared -o $@ $^ -lasound
......
configure
View file @ ba61d25c
This diff is collapsed.
configure.in
View file @ ba61d25c
...@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h) ...@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h)
AC_CANONICAL_HOST AC_CANONICAL_HOST
VLC_VERSION=0.2.61 VLC_VERSION=0.2.62
AC_SUBST(VLC_VERSION) AC_SUBST(VLC_VERSION)
VLC_CODENAME=Urumov VLC_CODENAME=Urumov
AC_SUBST(VLC_CODENAME) AC_SUBST(VLC_CODENAME)
...@@ -58,7 +58,7 @@ CPPFLAGS="${CPPFLAGS} -I/usr/local/include" ...@@ -58,7 +58,7 @@ CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
AC_CHECK_HEADERS(stddef.h) AC_CHECK_HEADERS(stddef.h)
AC_CHECK_HEADERS(getopt.h) AC_CHECK_HEADERS(getopt.h)
AC_CHECK_HEADERS(sys/sockio.h) AC_CHECK_HEADERS(sys/sockio.h)
AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h) AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)
AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h) AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
AC_CHECK_HEADERS(dlfcn.h image.h) AC_CHECK_HEADERS(dlfcn.h image.h)
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h) AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
...@@ -100,12 +100,6 @@ AC_C_CONST ...@@ -100,12 +100,6 @@ AC_C_CONST
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_HEADER_TIME AC_HEADER_TIME
dnl Checks for DVD ioctls
AC_CHECK_HEADERS(sys/ioctl.h,
[AC_CHECK_HEADERS(linux/cdrom.h)
AC_EGREP_HEADER(dvd,linux/cdrom.h,[AC_DEFINE(LINUX_DVD,1,DVD support for linux)
DVD=1])])
dnl default plugins dnl default plugins
PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion " PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion "
if test x$host_os = xbeos; then if test x$host_os = xbeos; then
...@@ -114,9 +108,11 @@ else ...@@ -114,9 +108,11 @@ else
ACCEL_PLUGINS="yuvmmx idctmmx idctmmxext motionmmx motionmmxext " ACCEL_PLUGINS="yuvmmx idctmmx idctmmxext motionmmx motionmmxext "
fi fi
if test x$DVD = x1; then dnl Checks for DVD ioctls
PLUGINS=${PLUGINS}"dvd " AC_CHECK_HEADERS(sys/ioctl.h,
fi [PLUGINS=${PLUGINS}"dvd "
AC_CHECK_HEADERS(linux/cdrom.h)
AC_EGREP_HEADER(dvd,linux/cdrom.h,[AC_DEFINE(LINUX_DVD,1,DVD support for linux)])])
ARCH=${host_cpu} ARCH=${host_cpu}
AC_ARG_ENABLE(ppro, AC_ARG_ENABLE(ppro,
......
debian/changelog
View file @ ba61d25c
vlc (0.2.62-1) unstable; urgency=low
* New release. Glide and GGI packages build again.
-- Samuel Hocevar <sam@zoy.org> Tue, 20 Feb 2001 23:34:34 +0100
vlc (0.2.61-1) unstable; urgency=low vlc (0.2.61-1) unstable; urgency=low
* New release. The package build works again. * New release. The package build works again.
......
include/tests.h
View file @ ba61d25c
...@@ -51,7 +51,7 @@ static __inline__ int CPUCapabilities( void ) ...@@ -51,7 +51,7 @@ static __inline__ int CPUCapabilities( void )
#else #else
int i_capabilities = CPU_CAPABILITY_NONE; int i_capabilities = CPU_CAPABILITY_NONE;
#ifdef __i386__ #ifdef __i386__
int i_eax, i_ebx, i_ecx, i_edx; unsigned int i_eax, i_ebx, i_ecx, i_edx;
boolean_t b_amd; boolean_t b_amd;
#define cpuid( a ) \ #define cpuid( a ) \
......
plugins/dvd/dvd_css.c
View file @ ba61d25c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dvd_css.c: Functions for DVD authentification and unscrambling * dvd_css.c: Functions for DVD authentification and unscrambling
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: dvd_css.c,v 1.13 2001/02/20 08:47:25 stef Exp $ * $Id: dvd_css.c,v 1.14 2001/02/20 23:30:15 sam Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
*****************************************************************************/ *****************************************************************************/
#include "defs.h" #include "defs.h"
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD ) || defined( SYS_BEOS )
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
...@@ -1256,4 +1254,4 @@ int CSSDescrambleSector( dvd_key_t pi_key, u8* pi_sec ) ...@@ -1256,4 +1254,4 @@ int CSSDescrambleSector( dvd_key_t pi_key, u8* pi_sec )
return(0); return(0);
} }
#endif
plugins/dvd/dvd_ioctl.h
View file @ ba61d25c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dvd_ioctl.h: DVD ioctl replacement function * dvd_ioctl.h: DVD ioctl replacement function
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: dvd_ioctl.h,v 1.1 2001/02/20 07:49:12 sam Exp $ * $Id: dvd_ioctl.h,v 1.2 2001/02/20 23:30:15 sam Exp $
* *
* Authors: David Giller <rafetmad@oxy.edu> * Authors: David Giller <rafetmad@oxy.edu>
* Eberhard Moenkeberg <emoenke@gwdg.de> * Eberhard Moenkeberg <emoenke@gwdg.de>
...@@ -556,9 +556,9 @@ struct dvd_layer { ...@@ -556,9 +556,9 @@ struct dvd_layer {
unsigned char track_density : 4; unsigned char track_density : 4;
unsigned char linear_density : 4; unsigned char linear_density : 4;
unsigned char bca : 1; unsigned char bca : 1;
uint32 start_sector; u32 start_sector;
uint32 end_sector; u32 end_sector;
uint32 end_sector_l0; u32 end_sector_l0;
}; };
struct dvd_physical { struct dvd_physical {
...@@ -745,7 +745,7 @@ struct request_sense { ...@@ -745,7 +745,7 @@ struct request_sense {
}; };
typedef struct { typedef struct {
uint16 report_key_length; u16 report_key_length;
unsigned char reserved1; unsigned char reserved1;
unsigned char reserved2; unsigned char reserved2;
#if defined(__BIG_ENDIAN_BITFIELD) #if defined(__BIG_ENDIAN_BITFIELD)
......
plugins/dvd/input_dvd.c
View file @ ba61d25c
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* -dvd_udf to find files * -dvd_udf to find files
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.17 2001/02/20 08:47:25 stef Exp $ * $Id: input_dvd.c,v 1.18 2001/02/20 23:30:15 sam Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -332,14 +332,7 @@ static int DVDProbe( probedata_t *p_data ) ...@@ -332,14 +332,7 @@ static int DVDProbe( probedata_t *p_data )
*****************************************************************************/ *****************************************************************************/
static int DVDCheckCSS( input_thread_t * p_input ) static int DVDCheckCSS( input_thread_t * p_input )
{ {
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD ) || defined( SYS_BEOS )
return CSSTest( p_input->i_handle ); return CSSTest( p_input->i_handle );
#else
/* DVD ioctls unavailable.
* FIXME: Check the stream to see whether it is encrypted or not
* to give and accurate error message */
return 0;
#endif
} }
/***************************************************************************** /*****************************************************************************
...@@ -373,7 +366,6 @@ static int DVDSetArea( input_thread_t * p_input, ...@@ -373,7 +366,6 @@ static int DVDSetArea( input_thread_t * p_input,
IfoReadVTS( &(p_method->ifo) ); IfoReadVTS( &(p_method->ifo) );
intf_WarnMsg( 2, "Ifo: VTS initialized" ); intf_WarnMsg( 2, "Ifo: VTS initialized" );
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD ) || defined( SYS_BEOS )
if( p_method->b_encrypted ) if( p_method->b_encrypted )
{ {
p_method->css.i_title = i_title; p_method->css.i_title = i_title;
...@@ -383,7 +375,6 @@ static int DVDSetArea( input_thread_t * p_input, ...@@ -383,7 +375,6 @@ static int DVDSetArea( input_thread_t * p_input,
CSSGetKey( &(p_method->css) ); CSSGetKey( &(p_method->css) );
intf_WarnMsg( 2, "CSS: VTS key initialized" ); intf_WarnMsg( 2, "CSS: VTS key initialized" );
} }
#endif
/* Set selected title start and size */ /* Set selected title start and size */
p_pgc = &p_method->ifo.vts.pgci_ti.p_srp[0].pgc; p_pgc = &p_method->ifo.vts.pgci_ti.p_srp[0].pgc;
...@@ -671,8 +662,6 @@ static void DVDInit( input_thread_t * p_input ) ...@@ -671,8 +662,6 @@ static void DVDInit( input_thread_t * p_input )
/* CSS initialisation */ /* CSS initialisation */
if( p_method->b_encrypted ) if( p_method->b_encrypted )
{ {
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD ) || defined( SYS_BEOS )
p_method->css = CSSInit( p_input->i_handle ); p_method->css = CSSInit( p_input->i_handle );
if( ( p_input->b_error = p_method->css.b_error ) ) if( ( p_input->b_error = p_method->css.b_error ) )
...@@ -681,11 +670,6 @@ static void DVDInit( input_thread_t * p_input ) ...@@ -681,11 +670,6 @@ static void DVDInit( input_thread_t * p_input )
return; return;
} }
intf_WarnMsg( 2, "CSS: initialized" ); intf_WarnMsg( 2, "CSS: initialized" );
#else
intf_ErrMsg( "Unscrambling not supported" );
p_input->b_error = 1;
return;
#endif
} }
/* Initialize ES structures */ /* Initialize ES structures */
...@@ -779,7 +763,6 @@ static int DVDRead( input_thread_t * p_input, ...@@ -779,7 +763,6 @@ static int DVDRead( input_thread_t * p_input,
/* Reads from DVD */ /* Reads from DVD */
readv( p_input->i_handle, p_vec, p_method->i_read_once ); readv( p_input->i_handle, p_vec, p_method->i_read_once );
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD ) || defined( SYS_BEOS )
if( p_method->b_encrypted ) if( p_method->b_encrypted )
{ {
for( i=0 ; i<p_method->i_read_once ; i++ ) for( i=0 ; i<p_method->i_read_once ; i++ )
...@@ -789,7 +772,6 @@ static int DVDRead( input_thread_t * p_input, ...@@ -789,7 +772,6 @@ static int DVDRead( input_thread_t * p_input,
((u8*)(p_vec[i].iov_base))[0x14] &= 0x8F; ((u8*)(p_vec[i].iov_base))[0x14] &= 0x8F;
} }
} }
#endif
/* Update netlist indexes */ /* Update netlist indexes */
input_NetlistMviovec( p_netlist, p_method->i_read_once, &p_data ); input_NetlistMviovec( p_netlist, p_method->i_read_once, &p_data );
......
plugins/dvd/input_dvd.h
View file @ ba61d25c
...@@ -40,9 +40,7 @@ typedef struct thread_dvd_data_s ...@@ -40,9 +40,7 @@ typedef struct thread_dvd_data_s
int i_end_cell; int i_end_cell;
/* Scrambling Information */ /* Scrambling Information */
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD ) || defined( SYS_BEOS )
struct css_s css; struct css_s css;
#endif
/* Structure that contains all information of the DVD */ /* Structure that contains all information of the DVD */
struct ifo_s ifo; struct ifo_s ifo;
...@@ -60,10 +58,8 @@ void IfoEnd( ifo_t * ); ...@@ -60,10 +58,8 @@ void IfoEnd( ifo_t * );
/***************************************************************************** /*****************************************************************************
* Prototypes in dvd_css.c * Prototypes in dvd_css.c
*****************************************************************************/ *****************************************************************************/
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD ) || defined( SYS_BEOS )
int CSSTest ( int ); int CSSTest ( int );
struct css_s CSSInit ( int ); struct css_s CSSInit ( int );
int CSSGetKey ( struct css_s * ); int CSSGetKey ( struct css_s * );
int CSSDescrambleSector( u8 * , u8 * ); int CSSDescrambleSector( u8 * , u8 * );
#endif
plugins/gnome/intf_gnome.c
View file @ ba61d25c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_gnome.c: Gnome interface * intf_gnome.c: Gnome interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_gnome.c,v 1.17 2001/02/20 09:10:36 sam Exp $ * $Id: intf_gnome.c,v 1.18 2001/02/20 23:30:15 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -170,7 +170,7 @@ static void intf_Run( intf_thread_t *p_intf ) ...@@ -170,7 +170,7 @@ static void intf_Run( intf_thread_t *p_intf )
{ {
/* gnome_init needs to know the command line. We don't care, so we /* gnome_init needs to know the command line. We don't care, so we
* give it an empty one */ * give it an empty one */
char *p_args[] = { }; char *p_args[] = { "" };
/* The data types we are allowed to receive */ /* The data types we are allowed to receive */
static GtkTargetEntry target_table[] = static GtkTargetEntry target_table[] =
...@@ -182,29 +182,33 @@ static void intf_Run( intf_thread_t *p_intf ) ...@@ -182,29 +182,33 @@ static void intf_Run( intf_thread_t *p_intf )
/* Initialize Gnome */ /* Initialize Gnome */
gnome_init( p_main->psz_arg0, VERSION, 1, p_args ); gnome_init( p_main->psz_arg0, VERSION, 1, p_args );
/* create some useful widgets that will certainly be used */ /* Create some useful widgets that will certainly be used */
p_intf->p_sys->p_window = create_intf_window( ); p_intf->p_sys->p_window = create_intf_window( );
p_intf->p_sys->p_popup = create_intf_popup( ); p_intf->p_sys->p_popup = create_intf_popup( );
/* accept file drops on the main window */ /* Set the title of the main window */
gtk_window_set_title( GTK_WINDOW(p_intf->p_sys->p_window),
VOUT_TITLE " (Gnome interface)");
/* Accept file drops on the main window */
gtk_drag_dest_set( GTK_WIDGET( p_intf->p_sys->p_window ), gtk_drag_dest_set( GTK_WIDGET( p_intf->p_sys->p_window ),
GTK_DEST_DEFAULT_ALL, target_table, GTK_DEST_DEFAULT_ALL, target_table,
1, GDK_ACTION_COPY ); 1, GDK_ACTION_COPY );
/* we don't create these ones yet because we perhaps won't need them */ /* We don't create these ones yet because we perhaps won't need them */
p_intf->p_sys->p_about = NULL; p_intf->p_sys->p_about = NULL;
p_intf->p_sys->p_playlist = NULL; p_intf->p_sys->p_playlist = NULL;
p_intf->p_sys->p_modules = NULL; p_intf->p_sys->p_modules = NULL;
p_intf->p_sys->p_fileopen = NULL; p_intf->p_sys->p_fileopen = NULL;
/* store p_sys to keep an eye on it */ /* Store p_intf to keep an eye on it */
gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window), gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window),
"p_intf", p_intf ); "p_intf", p_intf );
gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_popup), gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_popup),
"p_intf", p_intf ); "p_intf", p_intf );
/* show the control window */ /* Show the control window */
gtk_widget_show( p_intf->p_sys->p_window ); gtk_widget_show( p_intf->p_sys->p_window );
/* Sleep to avoid using all CPU - since some interfaces needs to access /* Sleep to avoid using all CPU - since some interfaces needs to access
...@@ -213,7 +217,7 @@ static void intf_Run( intf_thread_t *p_intf ) ...@@ -213,7 +217,7 @@ static void intf_Run( intf_thread_t *p_intf )
GnomeManage, p_intf ); GnomeManage, p_intf );
/* enter gnome mode */ /* Enter gnome mode */
gtk_main(); gtk_main();
/* launch stored callbacks */ /* launch stored callbacks */
......
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