Skip to content

V
vlc-gpu
Commit 305d90ff authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * miscellaneous Win32 fixes by Gildas Bazin <gbazin@netcourrier.com>, sorry
    for the 2 weeks delay.
parent b8ce47bb
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 56 deletions
plugins/gtk/gtk_playlist.c
View file @ 305d90ff
......@@ -2,7 +2,7 @@
* gtk_playlist.c : Interface for the playlist dialog
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: gtk_playlist.c,v 1.16 2001/05/30 23:02:04 stef Exp $
* $Id: gtk_playlist.c,v 1.17 2001/05/31 03:23:24 sam Exp $
*
* Authors: Pierre Baillet <oct@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -28,16 +28,19 @@
#include "defs.h"
#include <stdlib.h>
#include <gtk/gtk.h>
#include <string.h>
#include <sys/types.h> /* for readdir and stat stuff */
#include <dirent.h>
#ifndef WIN32
# include <dirent.h>
#endif
#include <sys/stat.h>
#include <unistd.h>
#include <gtk/gtk.h>
#include "config.h"
#include "common.h"
#include "threads.h"
......
plugins/gtk/gtk_playlist.h
View file @ 305d90ff
......@@ -2,7 +2,7 @@
* gtk_playlist.h : Playlist functions for the Gtk plugin.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: gtk_playlist.h,v 1.4 2001/05/19 00:39:30 stef Exp $
* $Id: gtk_playlist.h,v 1.5 2001/05/31 03:23:24 sam Exp $
*
* Authors: Pierre Baillet <oct@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -39,7 +39,7 @@ gboolean GtkPlaylistShow ( GtkWidget *, GdkEventButton *, gpointer );
gboolean GtkPlaylistPrev ( GtkWidget *, GdkEventButton *, gpointer );
gboolean GtkPlaylistNext ( GtkWidget *, GdkEventButton *, gpointer );
gboolean GtkPlaylistDragMotion( GtkWidget *, GdkDragContext *,
gint, gint, uint, gpointer );
gint, gint, guint, gpointer );
gboolean GtkPlaylistEvent ( GtkWidget *, GdkEvent *, gpointer );
void GtkPlaylistDragData ( GtkWidget *, GdkDragContext *,
gint, gint, GtkSelectionData *,
......
plugins/gtk/intf_gtk.c
View file @ 305d90ff
......@@ -2,7 +2,7 @@
* intf_gtk.c: Gtk+ interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_gtk.c,v 1.23 2001/05/30 23:02:04 stef Exp $
* $Id: intf_gtk.c,v 1.24 2001/05/31 03:23:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -35,6 +35,7 @@
#include <string.h> /* strerror() */
#include <stdio.h>
#include <glib/glib.h>
#include <gtk/gtk.h>
#include "config.h"
......
plugins/sdl/vout_sdl.c
View file @ 305d90ff
......@@ -2,7 +2,7 @@
* vout_sdl.c: SDL video output display method
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vout_sdl.c,v 1.53 2001/05/30 17:03:12 sam Exp $
* $Id: vout_sdl.c,v 1.54 2001/05/31 03:23:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
......@@ -262,7 +262,7 @@ static int vout_Init( vout_thread_t *p_vout )
static void vout_End( vout_thread_t *p_vout )
{
SDLCloseDisplay( p_vout );
SDL_Quit();
SDL_QuitSubSystem( SDL_INIT_VIDEO );
}
/*****************************************************************************
......
src/video_output/video_output.c
View file @ 305d90ff
......@@ -5,7 +5,7 @@
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: video_output.c,v 1.129 2001/05/30 17:03:13 sam Exp $
* $Id: video_output.c,v 1.130 2001/05/31 03:23:24 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -228,50 +228,6 @@ vout_thread_t * vout_CreateThread ( int *pi_status )
p_vout->i_pictures = 0;
/* Create and initialize system-dependant method - this function issues its
* own error messages */
if( p_vout->pf_create( p_vout ) )
{
module_Unneed( p_vout->p_module );
free( p_vout );
return( NULL );
}
intf_WarnMsg( 3, "actual configuration: %dx%d, %d/%d bpp (%d Bpl), "
"masks: 0x%x/0x%x/0x%x",
p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line,
p_vout->i_red_mask, p_vout->i_green_mask,
p_vout->i_blue_mask );
/* Calculate shifts from system-updated masks */
MaskToShift( &p_vout->i_red_lshift, &p_vout->i_red_rshift,
p_vout->i_red_mask );
MaskToShift( &p_vout->i_green_lshift, &p_vout->i_green_rshift,
p_vout->i_green_mask );
MaskToShift( &p_vout->i_blue_lshift, &p_vout->i_blue_rshift,
p_vout->i_blue_mask );
/* Set some useful colors */
p_vout->i_white_pixel = RGB2PIXEL( p_vout, 255, 255, 255 );
p_vout->i_black_pixel = RGB2PIXEL( p_vout, 0, 0, 0 );
p_vout->i_gray_pixel = RGB2PIXEL( p_vout, 128, 128, 128 );
p_vout->i_blue_pixel = RGB2PIXEL( p_vout, 0, 0, 50 );
/* Load fonts - fonts must be initialized after the system method since
* they may be dependant on screen depth and other thread properties */
p_vout->p_default_font = vout_LoadFont( VOUT_DEFAULT_FONT );
if( p_vout->p_default_font == NULL )
{
intf_ErrMsg( "vout error: could not load default font" );
}
p_vout->p_large_font = vout_LoadFont( VOUT_LARGE_FONT );
if( p_vout->p_large_font == NULL )
{
intf_ErrMsg( "vout error: could not load large font" );
}
/* Create thread and set locks */
vlc_mutex_init( &p_vout->picture_lock );
vlc_mutex_init( &p_vout->subpicture_lock );
......@@ -920,6 +876,50 @@ static int InitThread( vout_thread_t *p_vout )
p_vout->c_loops = 0;
#endif
/* Create and initialize system-dependant method - this function issues its
* own error messages */
if( p_vout->pf_create( p_vout ) )
{
module_Unneed( p_vout->p_module );
free( p_vout );
return( NULL );
}
intf_WarnMsg( 3, "actual configuration: %dx%d, %d/%d bpp (%d Bpl), "
"masks: 0x%x/0x%x/0x%x",
p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line,
p_vout->i_red_mask, p_vout->i_green_mask,
p_vout->i_blue_mask );
/* Calculate shifts from system-updated masks */
MaskToShift( &p_vout->i_red_lshift, &p_vout->i_red_rshift,
p_vout->i_red_mask );
MaskToShift( &p_vout->i_green_lshift, &p_vout->i_green_rshift,
p_vout->i_green_mask );
MaskToShift( &p_vout->i_blue_lshift, &p_vout->i_blue_rshift,
p_vout->i_blue_mask );
/* Set some useful colors */
p_vout->i_white_pixel = RGB2PIXEL( p_vout, 255, 255, 255 );
p_vout->i_black_pixel = RGB2PIXEL( p_vout, 0, 0, 0 );
p_vout->i_gray_pixel = RGB2PIXEL( p_vout, 128, 128, 128 );
p_vout->i_blue_pixel = RGB2PIXEL( p_vout, 0, 0, 50 );
/* Load fonts - fonts must be initialized after the system method since
* they may be dependant on screen depth and other thread properties */
p_vout->p_default_font = vout_LoadFont( VOUT_DEFAULT_FONT );
if( p_vout->p_default_font == NULL )
{
intf_ErrMsg( "vout error: could not load default font" );
}
p_vout->p_large_font = vout_LoadFont( VOUT_LARGE_FONT );
if( p_vout->p_large_font == NULL )
{
intf_ErrMsg( "vout error: could not load large font" );
}
/* Initialize output method - this function issues its own error messages */
if( p_vout->pf_init( p_vout ) )
{
......
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