Commit c84678fd authored by Felix Paul Kühne's avatar Felix Paul Kühne

We can't use this plugin for audio decoding on Leopard due to the removal of...

We can't use this plugin for audio decoding on Leopard due to the removal of the old pre-carbon SoundManager API.

As this plugin is heavily based on QuickDraw and Sound Manager, we definitively want a re-write using sane and supported APIs meaning either QTKit or a combination of CoreAudio and the 32bit C QuickTime API
parent cc13469b
...@@ -229,9 +229,14 @@ static int Open( vlc_object_t *p_this ) ...@@ -229,9 +229,14 @@ static int Open( vlc_object_t *p_this )
#ifdef __APPLE__ #ifdef __APPLE__
OSErr err; OSErr err;
SInt32 qtVersion; SInt32 qtVersion, macosversion;
err = Gestalt(gestaltQuickTimeVersion, &qtVersion); err = Gestalt(gestaltQuickTimeVersion, &qtVersion);
err = Gestalt(gestaltSystemVersion, &macosversion);
#ifndef NDEBUG
msg_Dbg( p_this, "mac os version is %#lx", macosversion );
msg_Dbg( p_this, "quicktime version is %#lx", qtVersion );
#endif
#endif #endif
switch( p_dec->fmt_in.i_codec ) switch( p_dec->fmt_in.i_codec )
...@@ -301,6 +306,19 @@ static int Open( vlc_object_t *p_this ) ...@@ -301,6 +306,19 @@ static int Open( vlc_object_t *p_this )
p_dec->pf_decode_audio = DecodeAudio; p_dec->pf_decode_audio = DecodeAudio;
return VLC_SUCCESS; return VLC_SUCCESS;
#else #else
#ifdef __APPLE__
/* FIXME: right now, we don't support audio decoding on 10.5 and later
because we are still using the hardcore-outdated SoundManager API,
which was removed after 10.4 */
if( macosversion >= 0x1050 || err != noErr )
{
msg_Warn( p_dec, "Your Mac OS version doesn't have SoundManager anymore. "
"You can't use this plugin for audio." );
return VLC_EGENERIC;
}
#endif
return OpenAudio( p_dec ); return OpenAudio( p_dec );
#endif #endif
...@@ -887,7 +905,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) ...@@ -887,7 +905,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
{ {
p_sys->i_late = 0; p_sys->i_late = 0;
} }
msg_Dbg( p_dec, "bufsize: %d", p_block->i_buffer); msg_Dbg( p_dec, "bufsize: %d", (int)p_block->i_buffer);
if( p_sys->i_late > 10 ) if( p_sys->i_late > 10 )
{ {
......
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