diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | include/Makefile.am | 22 | ||||
| -rw-r--r-- | include/xine/Makefile.am | 11 | ||||
| -rw-r--r-- | src/xine-engine/audio_out.c | 1 |
4 files changed, 15 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index cdb196f79..e347f1947 100644 --- a/configure.ac +++ b/configure.ac @@ -1159,7 +1159,6 @@ contrib/nosefart/Makefile contrib/vidix/Makefile contrib/vidix/drivers/Makefile include/Makefile -include/xine/Makefile include/xine/version.h lib/Makefile m4/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 1493a33f8..4af4290b3 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,17 +1,23 @@ -SUBDIRS = xine -#EXTRA_DIST = xine.h.in +EXTRA_DIST = xine/version.h.in if GENERATED_INTTYPES_H inttypes_h = inttypes.h endif -include_HEADERS = xine.h +nobase_include_HEADERS = xine.h xine/version.h xine/buffer.h \ + xine/metronom.h xine/configfile.h xine/vo_scale.h \ + xine/audio_out.h xine/resample.h xine/video_out.h \ + xine/xine_internal.h xine/spu_decoder.h xine/video_overlay.h \ + xine/osd.h xine/spu.h xine/scratch.h xine/xine_plugin.h \ + xine/xineintl.h xine/plugin_catalog.h xine/audio_decoder.h \ + xine/video_decoder.h xine/post.h xine/io_helper.h \ + xine/broadcaster.h xine/info_helper.h xine/refcounter.h \ + xine/alphablend.h xine/demux.h xine/input_plugin.h \ + xine/attributes.h xine/compat.h xine/xine_buffer.h \ + xine/xineutils.h xine/xmllexer.h xine/xmlparser.h xine/list.h \ + xine/array.h xine/sorted_array.h xine/pool.h \ + xine/ring_buffer.h xine/os_types.h xine/vdr.h $(inttypes_h) noinst_HEADERS = config.h configure.h CONFIG_CLEAN_FILES = $(inttypes_h) - -install-data-local: install-includeHEADERS -if GENERATED_INTTYPES_H - $(INSTALL) inttypes.h $(DESTDIR)$(includedir) -endif diff --git a/include/xine/Makefile.am b/include/xine/Makefile.am deleted file mode 100644 index 14eb98445..000000000 --- a/include/xine/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -EXTRA_DIST = version.h.in - -xineincludedir = $(includedir)/xine -xineinclude_HEADERS = version.h buffer.h metronom.h configfile.h vo_scale.h \ - audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ - video_overlay.h osd.h spu.h scratch.h xine_plugin.h xineintl.h \ - plugin_catalog.h audio_decoder.h video_decoder.h post.h \ - io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h \ - demux.h input_plugin.h attributes.h compat.h xine_buffer.h \ - xineutils.h xmllexer.h xmlparser.h list.h array.h sorted_array.h \ - pool.h ring_buffer.h os_types.h vdr.h base64.h diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 855051582..34f982d18 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -1626,6 +1626,7 @@ static void ao_close(xine_audio_port_t *this_gen, xine_stream_t *stream) { } else fifo_wait_empty(this->out_fifo); + ao_set_property(this_gen, AO_PROP_DISCARD_BUFFERS, 0); } pthread_mutex_lock( &this->driver_lock ); |