Commit 98363dc6 authored by Eric Petit's avatar Eric Petit
Browse files

* AudioOutput.cpp: added sanity tests;

 * VlcWrapper.h, Interface.cpp: removed an unused variable.
parent 29b488fe
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* AudioOutput.cpp: BeOS audio output * AudioOutput.cpp: BeOS audio output
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: AudioOutput.cpp,v 1.19 2002/12/09 07:57:04 titer Exp $ * $Id: AudioOutput.cpp,v 1.20 2002/12/09 13:37:38 titer Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -66,6 +66,11 @@ int E_(OpenAudio) ( vlc_object_t * p_this ) ...@@ -66,6 +66,11 @@ int E_(OpenAudio) ( vlc_object_t * p_this )
int i_nb_channels; int i_nb_channels;
aout_instance_t *p_aout = (aout_instance_t*) p_this; aout_instance_t *p_aout = (aout_instance_t*) p_this;
p_aout->output.p_sys = (aout_sys_t *) malloc( sizeof( aout_sys_t ) ); p_aout->output.p_sys = (aout_sys_t *) malloc( sizeof( aout_sys_t ) );
if( p_aout->output.p_sys == NULL )
{
msg_Err( p_aout, "Not enough memory" );
return -1;
}
aout_sys_t *p_sys = p_aout->output.p_sys; aout_sys_t *p_sys = p_aout->output.p_sys;
...@@ -101,6 +106,14 @@ int E_(OpenAudio) ( vlc_object_t * p_this ) ...@@ -101,6 +106,14 @@ int E_(OpenAudio) ( vlc_object_t * p_this )
p_sys->p_player = new BSoundPlayer( p_format, "player", p_sys->p_player = new BSoundPlayer( p_format, "player",
Play, NULL, p_aout ); Play, NULL, p_aout );
if( p_sys->p_player->InitCheck() != B_OK )
{
msg_Err( p_aout, "BSoundPlayer InitCheck failed" );
delete p_sys->p_player;
free( p_sys );
return -1;
}
p_sys->p_player->Start(); p_sys->p_player->Start();
p_sys->p_player->SetHasData( true ); p_sys->p_player->SetHasData( true );
......
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
* intf_beos.cpp: beos interface * intf_beos.cpp: beos interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: Interface.cpp,v 1.6 2002/11/27 05:36:41 titer Exp $ * $Id: Interface.cpp,v 1.7 2002/12/09 13:37:38 titer Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
* Tony Castley <tony@castley.net> * Tony Castley <tony@castley.net>
* Richard Shepherd <richard@rshepherd.demon.co.uk> * Richard Shepherd <richard@rshepherd.demon.co.uk>
* Stephan Aßmus <stippi@yellowbites.com> * Stephan Aßmus <stippi@yellowbites.com>
* Eric Petit <titer@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -90,7 +91,6 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) ...@@ -90,7 +91,6 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
message.AddPointer("window", p_intf->p_sys->p_window); message.AddPointer("window", p_intf->p_sys->p_window);
be_app->PostMessage(&message); be_app->PostMessage(&message);
} }
p_intf->p_sys->b_disabled_menus = 0;
p_intf->p_sys->i_saved_volume = AOUT_VOLUME_DEFAULT; p_intf->p_sys->i_saved_volume = AOUT_VOLUME_DEFAULT;
p_intf->p_sys->b_loop = 0; p_intf->p_sys->b_loop = 0;
p_intf->p_sys->b_mute = 0; p_intf->p_sys->b_mute = 0;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port) * VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port)
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: VlcWrapper.h,v 1.9 2002/12/09 07:57:04 titer Exp $ * $Id: VlcWrapper.h,v 1.10 2002/12/09 13:37:38 titer Exp $
* *
* Authors: Florian G. Pflug <fgp@phlo.org> * Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -37,7 +37,6 @@ struct intf_sys_t ...@@ -37,7 +37,6 @@ struct intf_sys_t
{ {
InterfaceWindow * p_window; InterfaceWindow * p_window;
vlc_bool_t b_disabled_menus;
vlc_bool_t b_loop; vlc_bool_t b_loop;
vlc_bool_t b_mute; vlc_bool_t b_mute;
int i_part; int i_part;
......
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