Commit 00d327ff authored by Christophe Massiot's avatar Christophe Massiot

* Resampler plug-in based on CoreAudio's AudioConverter.

parent 912d212c
...@@ -2630,11 +2630,15 @@ AC_ARG_ENABLE(macosx, ...@@ -2630,11 +2630,15 @@ AC_ARG_ENABLE(macosx,
[if test "x${enable_macosx}" = "xyes" [if test "x${enable_macosx}" = "xyes"
then then
BUILTINS="${BUILTINS} macosx" BUILTINS="${BUILTINS} macosx"
PLUGINS="${PLUGINS} coreaudio_resampler"
LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC" LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC"
LDFLAGS_coreaudio_resampler="${LDFLAGS_coreaudio_resampler} -framework AudioToolbox"
fi], fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h, [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
BUILTINS="${BUILTINS} macosx" BUILTINS="${BUILTINS} macosx"
PLUGINS="${PLUGINS} coreaudio_resampler"
LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC" LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC"
LDFLAGS_coreaudio_resampler="${LDFLAGS_coreaudio_resampler} -framework AudioToolbox"
)]) )])
dnl dnl
......
...@@ -3,3 +3,4 @@ SOURCES_ugly_resampler = modules/audio_filter/resampler/ugly.c ...@@ -3,3 +3,4 @@ SOURCES_ugly_resampler = modules/audio_filter/resampler/ugly.c
SOURCES_linear_resampler = modules/audio_filter/resampler/linear.c SOURCES_linear_resampler = modules/audio_filter/resampler/linear.c
SOURCES_bandlimited_resampler = modules/audio_filter/resampler/bandlimited.c \ SOURCES_bandlimited_resampler = modules/audio_filter/resampler/bandlimited.c \
modules/audio_filter/resampler/bandlimited.h modules/audio_filter/resampler/bandlimited.h
SOURCES_coreaudio_resampler = modules/audio_filter/resampler/coreaudio.c
This diff is collapsed.
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* decoders. * decoders.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2002 VideoLAN * Copyright (C) 1998-2002 VideoLAN
* $Id: input.c,v 1.227 2003/03/25 17:07:45 gbazin Exp $ * $Id: input.c,v 1.228 2003/03/30 01:13:37 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include "input_ext-plugins.h" #include "input_ext-plugins.h"
#include "stream_output.h" #include "stream_output.h"
#include <vlc/vout.h>
#include "interface.h" #include "interface.h"
...@@ -595,7 +596,7 @@ static void EndThread( input_thread_t * p_input ) ...@@ -595,7 +596,7 @@ static void EndThread( input_thread_t * p_input )
{ {
vlc_object_detach( p_object ); vlc_object_detach( p_object );
vlc_object_release( p_object ); vlc_object_release( p_object );
vout_Destroy( p_object ); vout_Destroy( (vout_thread_t *)p_object );
} }
free( p_input->psz_source ); free( p_input->psz_source );
......
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