Commit a3412c81 authored by Sam Hocevar's avatar Sam Hocevar

* ./modules/gui/qnx/*: ported the QNX audio output to the new API, courtesy

    of Pascal Levesque.
parent aeaf6737
...@@ -276,7 +276,7 @@ S: USA, California ...@@ -276,7 +276,7 @@ S: USA, California
N: Pascal Levesque N: Pascal Levesque
E: pascal.levesque@mindready.com E: pascal.levesque@mindready.com
D: QNX RTOS video output D: QNX RTOS video output and audio output
S: Canada, Qubec S: Canada, Qubec
N: Arkadiusz Lipiec N: Arkadiusz Lipiec
......
This diff is collapsed.
...@@ -129,7 +129,7 @@ static void SetPalette ( vout_thread_t *, u16 *, u16 *, u16 * ); ...@@ -129,7 +129,7 @@ static void SetPalette ( vout_thread_t *, u16 *, u16 *, u16 * );
* actual properties of the display. * actual properties of the display.
*****************************************************************************/ *****************************************************************************/
int E_(OpenVideo) ( vlc_object_t *p_this ) int E_(OpenVideo) ( vlc_object_t *p_this )
{ {
vout_thread_t * p_vout = (vout_thread_t *)p_this; vout_thread_t * p_vout = (vout_thread_t *)p_this;
/* init connection to photon */ /* init connection to photon */
...@@ -277,7 +277,7 @@ static void QNXEnd( vout_thread_t *p_vout ) ...@@ -277,7 +277,7 @@ static void QNXEnd( vout_thread_t *p_vout )
* Terminate an output method created by QNXCreate * Terminate an output method created by QNXCreate
*****************************************************************************/ *****************************************************************************/
void E_(CloseVideo) ( vlc_object_t *p_this ) void E_(CloseVideo) ( vlc_object_t *p_this )
{ {
vout_thread_t * p_vout = (vout_thread_t *)p_this; vout_thread_t * p_vout = (vout_thread_t *)p_this;
/* destroy the window */ /* destroy the window */
...@@ -541,16 +541,6 @@ static int QNXInitDisplay( vout_thread_t * p_vout ) ...@@ -541,16 +541,6 @@ static int QNXInitDisplay( vout_thread_t * p_vout )
return( 1 ); return( 1 );
} }
/* switch to normal mode if no overlay support */
// printf("minfo.mode_capabilities1: 0x%x\n", minfo.mode_capabilities1);
if( p_vout->p_sys->i_mode == MODE_VIDEO_OVERLAY &&
!( minfo.mode_capabilities1 & PgVM_MODE_CAP1_VIDEO_OVERLAY ) )
{
msg_Err( p_vout, "no overlay support detected" );
p_vout->p_sys->i_mode = MODE_NORMAL_MEM;
}
if( p_vout->p_sys->i_mode == MODE_VIDEO_OVERLAY ) if( p_vout->p_sys->i_mode == MODE_VIDEO_OVERLAY )
{ {
int i = 0; int i = 0;
......
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