Commit fd62016c authored by Cyril Deguet's avatar Cyril Deguet
Browse files

* output.c: avoid a floating point exception when aout-rate==0

* gtk2_api.cpp: made valgrind happy ;)
parent 73867cc4
......@@ -2,7 +2,7 @@
* gtk2_api.cpp: Various gtk2-specific functions
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: gtk2_api.cpp,v 1.13 2003/04/21 21:51:16 asmax Exp $
* $Id: gtk2_api.cpp,v 1.14 2003/04/22 19:26:02 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
......@@ -52,19 +52,25 @@ void OSAPI_SendMessage( SkinWindow *win, unsigned int message, unsigned int para
void OSAPI_PostMessage( SkinWindow *win, unsigned int message, unsigned int param1,
long param2 )
{
GdkEventClient *event = new GdkEventClient;
GdkEventClient *event = (GdkEventClient *) new GdkEvent;
event->type = GDK_CLIENT_EVENT;
if( win == NULL )
{
event->window = NULL;
}
else
{
event->window = ((GTK2Window *)win)->GetHandle();
}
event->send_event = 0;
event->message_type = NULL;
event->data_format = 32;
event->data.l[0] = message;
event->data.l[1] = param1;
event->data.l[2] = param2;
event->data.l[3] = 0;
event->data.l[4] = 0;
gdk_event_put( (GdkEvent *)event );
......
......@@ -2,7 +2,7 @@
* skin-main.cpp: skins plugin for VLC
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: skin_main.cpp,v 1.16 2003/04/21 18:39:39 asmax Exp $
* $Id: skin_main.cpp,v 1.17 2003/04/22 19:26:02 asmax Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -107,8 +107,8 @@ static int Open ( vlc_object_t *p_this )
#if !defined WIN32
// Initialize GDK
int i_args = 1;
char *p_args[] = { "", NULL };
int i_args = 3;
char *p_args[] = { "", "", "--sync", NULL };
char **pp_args = p_args;
gdk_init( &i_args, &pp_args );
......
......@@ -2,7 +2,7 @@
* output.c : internal management of output streams for the audio output
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: output.c,v 1.36 2003/02/08 17:26:00 massiot Exp $
* $Id: output.c,v 1.37 2003/04/22 19:26:02 asmax Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -44,6 +44,8 @@ int aout_OutputNew( aout_instance_t * p_aout,
char * psz_name = config_GetPsz( p_aout, "aout" );
int i_rate = config_GetInt( p_aout, "aout-rate" );
vlc_value_t val;
/* kludge to avoid a fpu error when rate is 0... */
if( i_rate == 0 ) i_rate = -1;
memcpy( &p_aout->output.output, p_format, sizeof(audio_sample_format_t) );
if ( i_rate != -1 )
......
Supports Markdown
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