diff options
| -rw-r--r-- | intl/Makefile.in | 3 | ||||
| -rw-r--r-- | misc/xine-config.in | 2 | ||||
| -rw-r--r-- | src/audio_out/audio_irixal_out.c | 12 | ||||
| -rw-r--r-- | src/xine-engine/configfile.c | 8 |
4 files changed, 16 insertions, 9 deletions
diff --git a/intl/Makefile.in b/intl/Makefile.in index 22695b7b2..34138694e 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -115,12 +115,11 @@ libintl.a libgnuintl.a: $(OBJECTS) $(AR) cru $@ $(OBJECTS) $(RANLIB) $@ +# No -rpath, this is only a convenience library libintl.la libgnuintl.la: $(OBJECTS) $(LIBTOOL) --mode=link \ $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ $(OBJECTS) @LIBICONV@ \ - -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ - -rpath $(libdir) \ -no-undefined libintl.h: libgnuintl.h diff --git a/misc/xine-config.in b/misc/xine-config.in index 97c5afc6b..8126b9022 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -96,7 +96,7 @@ if test "$echo_cflags" = "yes"; then fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -lxineutils -lxine @INTLLIBS@ @THREAD_LIBS@ + echo -L@libdir@ -lxineutils -lxine @THREAD_LIBS@ fi if test "$echo_plugindir" = "yes"; then echo "@XINE_PLUGINPATH@" diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c index b7fc38971..d026b643b 100644 --- a/src/audio_out/audio_irixal_out.c +++ b/src/audio_out/audio_irixal_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_irixal_out.c,v 1.4 2001/11/30 00:53:50 f1rmb Exp $ + * $Id: audio_irixal_out.c,v 1.5 2002/01/09 15:16:37 mshopf Exp $ */ #ifdef HAVE_CONFIG_H @@ -50,7 +50,7 @@ //# endif //#endif -#define AO_IRIXAL_IFACE_VERSION 2 +#define AO_IRIXAL_IFACE_VERSION 3 #define DEFAULT_GAP_TOLERANCE 5000 @@ -207,7 +207,7 @@ static int ao_irixal_bytes_per_frame(ao_driver_t *this_gen) static int ao_irixal_get_gap_tolerance (ao_driver_t *this_gen) { irixal_driver_t *this = (irixal_driver_t *) this_gen; - return this->gap_tolerance; /* ??? */ + return this->gap_tolerance; } static int ao_irixal_delay (ao_driver_t *this_gen) @@ -355,7 +355,11 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) printf (" capabilities 0x%X\n",this->capabilities); - this->gap_tolerance = config->lookup_int (config, "irixal_gap_tolerance", DEFAULT_GAP_TOLERANCE); + /* TODO: anything can change during runtime... move check to the right location */ + this->gap_tolerance = config->register_range (config, "audio.irixal_gap_tolerance", + DEFAULT_GAP_TOLERANCE, 0, 90000, + "irixal audio output maximum gap length in 1/90000s", + NULL, NULL, NULL); this->ao_driver.get_capabilities = ao_irixal_get_capabilities; this->ao_driver.get_property = ao_irixal_get_property; diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 02e220733..d3652485e 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: configfile.c,v 1.13 2001/12/01 22:38:32 guenter Exp $ + * $Id: configfile.c,v 1.14 2002/01/09 15:16:37 mshopf Exp $ * * config file management - implementation * @@ -559,6 +559,7 @@ static void config_file_read (config_values_t *this, char *filename){ config_values_t *config_file_init (char *filename) { + volatile /* is this a (old, 2.91.66) irix gcc bug?!? */ config_values_t *this; if ( (this = xine_xmalloc(sizeof(config_values_t))) ) { @@ -567,7 +568,7 @@ config_values_t *config_file_init (char *filename) { this->last = NULL; config_file_read (this, filename); - + } else { printf ("configfile: could not allocate config object\n"); exit (1); @@ -591,6 +592,9 @@ config_values_t *config_file_init (char *filename) { /* * $Log: configfile.c,v $ + * Revision 1.14 2002/01/09 15:16:37 mshopf + * IRIX port finally compiles (and actually works) again. + * * Revision 1.13 2001/12/01 22:38:32 guenter * add avi subtitle decoder (based on mplayer code), minor cleanups, removed register_empty function from configfile (undocumented and doesn't make sense) * |