patch by Jürgen Keil

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1062 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi_esp 2001-06-08 23:36:58 +00:00
parent 1a0e50d5f3
commit e2fac92b09
3 changed files with 41 additions and 14 deletions

View File

@ -1,13 +1,16 @@
Notes for Solaris users Notes for Solaris users
======================= =======================
1. To build the package you will need GNU make (gmake, /opt/sfw/gmake), 1. It *only* works on Solaris x86. It can't work on SPARC systems due to
the use of win32 codecs.
2. To build the package you will need GNU make (gmake, /opt/sfw/gmake),
native Solaris make will not work. native Solaris make will not work.
2. For DVD support you must have the patched libcss installed. Patch: 3. For DVD support you must have the patched libcss installed. Patch:
http://www.tools.de/solaris/mplayer/ http://www.tools.de/solaris/mplayer/
3. Due to two bugs in solaris 8 x86, you cannot reliably play DVDs using a 4. Due to two bugs in solaris 8 x86, you cannot reliably play DVDs using a
capacity >4GB: capacity >4GB:
- The sd(7D) driver on solaris 8 x86 driver has bug when accessing a - The sd(7D) driver on solaris 8 x86 driver has bug when accessing a

42
mixer.c
View File

@ -6,19 +6,18 @@
#include <unistd.h> #include <unistd.h>
#include "config.h" #include "config.h"
#ifdef USE_OSS_AUDIO
#include <sys/soundcard.h>
#endif
#ifdef USE_SUN_AUDIO
#include <sys/audioio.h>
#endif
#include "mixer.h" #include "mixer.h"
#if defined(USE_OSS_AUDIO) #if defined(USE_OSS_AUDIO)
/*
* Mixer interface using OSS style soundcard commands.
*/
#include <sys/soundcard.h>
char * mixer_device=DEV_MIXER; char * mixer_device=DEV_MIXER;
int mixer_usemaster=0; int mixer_usemaster=0;
@ -66,8 +65,16 @@ void mixer_setvolume( float l,float r )
close( fd ); close( fd );
} }
} }
#elif defined(USE_SUN_AUDIO) #elif defined(USE_SUN_AUDIO)
/*
* Mixer interface using Sun style soundcard commands.
*/
#include <sys/audioio.h>
char * mixer_device="/dev/audioctl"; char * mixer_device="/dev/audioctl";
int mixer_usemaster=0; int mixer_usemaster=0;
@ -101,6 +108,23 @@ void mixer_setvolume( float l,float r )
close( fd ); close( fd );
} }
} }
#else
/*
* No usable Mixer interface selected.
* Just some stub routines.
*/
char * mixer_device=NULL;
int mixer_usemaster=0;
void mixer_getvolume( float *l,float *r ){
*l = *r = 50.0;
}
void mixer_setvolume( float l,float r ){
}
#endif #endif

View File

@ -175,7 +175,7 @@ static int sun_vcd_read(int fd, int *offset)
(error_field << 1); (error_field << 1);
cdb.cdb_opaque[10] = sub_channel; cdb.cdb_opaque[10] = sub_channel;
sc.uscsi_cdb = &cdb; sc.uscsi_cdb = (caddr_t)&cdb;
sc.uscsi_cdblen = 12; sc.uscsi_cdblen = 12;
sc.uscsi_bufaddr = vcd_buf; sc.uscsi_bufaddr = vcd_buf;
sc.uscsi_buflen = 2336; sc.uscsi_buflen = 2336;