diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2007-03-15 11:39:53 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2007-03-15 11:39:53 +0000 |
| commit | 4d0df9433c3a9ba3345c4d394b7ec20653ee6044 (patch) | |
| tree | 075dbaaf00bbc7b14de4a6d87dc7519c4d90bfb9 /sys/Makefile.am | |
| parent | 1be3219c706bf105acde3efcafe20b962def928d (diff) | |
Activate osxaudio in gst-plugins-good with proper build setup.
Original commit message from CVS:
* configure.ac:
* sys/Makefile.am:
* sys/osxaudio/Makefile.am:
* sys/osxaudio/gstosxaudio.c:
* sys/osxaudio/gstosxaudiosink.c:
(gst_osx_audio_sink_osxelement_do_init), (gst_osx_audio_sink_init),
(gst_osx_audio_sink_getcaps),
(gst_osx_audio_sink_create_ringbuffer), (plugin_init):
* sys/osxaudio/gstosxaudiosrc.c:
(gst_osx_audio_src_osxelement_do_init), (gst_osx_audio_src_init),
(gst_osx_audio_src_create_ringbuffer):
* sys/osxaudio/gstosxringbuffer.c: (gst_osx_ring_buffer_get_type),
(gst_osx_ring_buffer_class_init), (gst_osx_ring_buffer_init),
(gst_osx_ring_buffer_acquire), (gst_osx_ring_buffer_start),
(gst_osx_ring_buffer_pause), (gst_osx_ring_buffer_stop):
* sys/osxaudio/gstosxringbuffer.h:
Activate osxaudio in gst-plugins-good with proper build setup.
Add inlined documentation.
Fix debug statements
Fix ringbuffer when pausing.
Fixes #323471
Diffstat (limited to 'sys/Makefile.am')
| -rw-r--r-- | sys/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index 8662114f..aee23c6e 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -16,11 +16,11 @@ else SUNAUDIO_DIR= endif -# if USE_OSX_AUDIO -# OSX_AUDIO_DIR=osxaudio -# else -# OSX_AUDIO_DIR= -# endif +if USE_OSX_AUDIO +OSX_AUDIO_DIR=osxaudio +else +OSX_AUDIO_DIR= +endif # if USE_OSX_VIDEO # OSX_VIDEO_DIR=osxvideo @@ -64,6 +64,6 @@ else XIMAGE_DIR= endif -SUBDIRS=$(OSS_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) +SUBDIRS=$(OSS_DIR) $(OSX_AUDIO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) DIST_SUBDIRS=oss sunaudio v4l2 ximage |