Skip to content

V
vlc-gpu
Commit 1c99dc85 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* updated version information to 0.2.60 -- today's release 

 * started porting the X11 vout (still disabled)
 * a few unnoticeable changes in the Gnome intf
parent 8a1ec969
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1150 additions and 965 deletions
ChangeLog
View file @ 1c99dc85
### THIS CHANGELOG HASN'T BEEN UPDATED FOR UNSTABLE ###
0.1.99j: 0.1.99j:
* Added hardware YUV overlay support (SDL). Huge performance * Added hardware YUV overlay support (SDL). Huge performance
......
Makefile.in
View file @ 1c99dc85
...@@ -332,7 +332,6 @@ PLUGIN_MGA = plugins/mga/mga.o \ ...@@ -332,7 +332,6 @@ PLUGIN_MGA = plugins/mga/mga.o \
plugins/mga/vout_mga.o plugins/mga/vout_mga.o
PLUGIN_X11= plugins/x11/x11.o \ PLUGIN_X11= plugins/x11/x11.o \
plugins/x11/intf_x11.o \
plugins/x11/vout_x11.o plugins/x11/vout_x11.o
PLUGIN_YUV = plugins/yuv/yuv.o \ PLUGIN_YUV = plugins/yuv/yuv.o \
......
TODO
View file @ 1c99dc85
...@@ -213,7 +213,7 @@ Status: Done 27 Aug 2000 (Meuuh) ...@@ -213,7 +213,7 @@ Status: Done 27 Aug 2000 (Meuuh)
Task: 0x36 Task: 0x36
Difficulty: Medium Difficulty: Medium
Urgency: Normal Urgency: Normal
Description: Description: Enhance the interface
. Finish the new keyboard input interface to support . Finish the new keyboard input interface to support
interfaces that allow modifiers. This will allow the SDL to run interfaces that allow modifiers. This will allow the SDL to run
properly. properly.
......
configure
View file @ 1c99dc85
This diff is collapsed.
configure.in
View file @ 1c99dc85
...@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h) ...@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h)
AC_CANONICAL_HOST AC_CANONICAL_HOST
VLC_VERSION=0.2.50 VLC_VERSION=0.2.60
AC_SUBST(VLC_VERSION) AC_SUBST(VLC_VERSION)
VLC_CODENAME=Urumov VLC_CODENAME=Urumov
AC_SUBST(VLC_CODENAME) AC_SUBST(VLC_CODENAME)
......
debian/changelog
View file @ 1c99dc85
vlc (0.2.60-1) unstable; urgency=low
* New release. The package build is most presumably FUBAR.
-- Samuel Hocevar <sam@zoy.org> Wed, 14 Feb 2001 08:33:46 +0100
vlc (0.2.50-1) unstable; urgency=low vlc (0.2.50-1) unstable; urgency=low
* Only build vlc-glide under x86 (Closes: #84046). * Only build vlc-glide under x86 (Closes: #84046).
......
plugins/dummy/dummy.c
View file @ 1c99dc85
...@@ -33,14 +33,6 @@ ...@@ -33,14 +33,6 @@
#include "common.h" /* boolean_t, byte_t */ #include "common.h" /* boolean_t, byte_t */
#include "threads.h" #include "threads.h"
#include "mtime.h" #include "mtime.h"
#include "tests.h"
#include "interface.h"
#include "audio_output.h"
#include "video.h"
#include "video_output.h"
#include "modules.h" #include "modules.h"
#include "modules_inner.h" #include "modules_inner.h"
......
plugins/gnome/gnome.c
View file @ 1c99dc85
...@@ -33,11 +33,6 @@ ...@@ -33,11 +33,6 @@
#include "common.h" /* boolean_t, byte_t */ #include "common.h" /* boolean_t, byte_t */
#include "threads.h" #include "threads.h"
#include "mtime.h" #include "mtime.h"
#include "tests.h"
#include "interface.h"
#include "video.h"
#include "video_output.h"
#include "modules.h" #include "modules.h"
#include "modules_inner.h" #include "modules_inner.h"
......
plugins/gnome/gnome_callbacks.c
View file @ 1c99dc85
...@@ -99,14 +99,7 @@ on_menubar_playlist_activate (GtkMenuItem *menuitem, ...@@ -99,14 +99,7 @@ on_menubar_playlist_activate (GtkMenuItem *menuitem,
"p_intf", p_intf ); "p_intf", p_intf );
} }
gtk_widget_show( p_intf->p_sys->p_playlist ); gtk_widget_show( p_intf->p_sys->p_playlist );
} gdk_window_raise( p_intf->p_sys->p_playlist->window );
void
on_menubar_plugins_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
} }
...@@ -131,6 +124,7 @@ on_menubar_about_activate (GtkMenuItem *menuitem, ...@@ -131,6 +124,7 @@ on_menubar_about_activate (GtkMenuItem *menuitem,
"p_intf", p_intf ); "p_intf", p_intf );
} }
gtk_widget_show( p_intf->p_sys->p_about ); gtk_widget_show( p_intf->p_sys->p_about );
gdk_window_raise( p_intf->p_sys->p_about->window );
} }
...@@ -208,6 +202,7 @@ on_toolbar_playlist_clicked (GtkButton *button, ...@@ -208,6 +202,7 @@ on_toolbar_playlist_clicked (GtkButton *button,
"p_intf", p_intf ); "p_intf", p_intf );
} }
gtk_widget_show( p_intf->p_sys->p_playlist ); gtk_widget_show( p_intf->p_sys->p_playlist );
gdk_window_raise( p_intf->p_sys->p_playlist->window );
} }
...@@ -354,6 +349,7 @@ on_popup_about_activate (GtkMenuItem *menuitem, ...@@ -354,6 +349,7 @@ on_popup_about_activate (GtkMenuItem *menuitem,
"p_intf", p_intf ); "p_intf", p_intf );
} }
gtk_widget_show( p_intf->p_sys->p_about ); gtk_widget_show( p_intf->p_sys->p_about );
gdk_window_raise( p_intf->p_sys->p_about->window );
} }
...@@ -466,3 +462,67 @@ on_hscale_button_press_event (GtkWidget *widget, ...@@ -466,3 +462,67 @@ on_hscale_button_press_event (GtkWidget *widget,
} }
void
on_intf_modules_destroy (GtkObject *object,
gpointer user_data)
{
}
void
on_modules_ok_clicked (GtkButton *button,
gpointer user_data)
{
intf_thread_t *p_intf = GetIntf( GTK_WIDGET(button), "intf_modules" );
gtk_widget_hide( p_intf->p_sys->p_modules );
}
void
on_modules_apply_clicked (GtkButton *button,
gpointer user_data)
{
}
void
on_modules_cancel_clicked (GtkButton *button,
gpointer user_data)
{
intf_thread_t *p_intf = GetIntf( GTK_WIDGET(button), "intf_modules" );
gtk_widget_hide( p_intf->p_sys->p_modules );
}
void
on_playlist_ok_clicked (GtkButton *button,
gpointer user_data)
{
intf_thread_t *p_intf = GetIntf( GTK_WIDGET(button), "intf_playlist" );
gtk_widget_hide( p_intf->p_sys->p_playlist );
}
void
on_menubar_modules_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
intf_thread_t *p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_window" );
if( !GTK_IS_WIDGET( p_intf->p_sys->p_modules ) )
{
p_intf->p_sys->p_modules = create_intf_modules();
gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_modules ),
"p_intf", p_intf );
}
gtk_widget_show( p_intf->p_sys->p_modules );
gdk_window_raise( p_intf->p_sys->p_modules->window );
}
plugins/gnome/gnome_callbacks.h
View file @ 1c99dc85
...@@ -159,3 +159,31 @@ gboolean ...@@ -159,3 +159,31 @@ gboolean
on_hscale_button_press_event (GtkWidget *widget, on_hscale_button_press_event (GtkWidget *widget,
GdkEventButton *event, GdkEventButton *event,
gpointer user_data); gpointer user_data);
void
on_intf_modules_destroy (GtkObject *object,
gpointer user_data);
void
on_modules_ok_clicked (GtkButton *button,
gpointer user_data);
void
on_modules_apply_clicked (GtkButton *button,
gpointer user_data);
void
on_modules_cancel_clicked (GtkButton *button,
gpointer user_data);
void
on_intf_playlist_destroy (GtkObject *object,
gpointer user_data);
void
on_playlist_ok_clicked (GtkButton *button,
gpointer user_data);
void
on_menubar_modules_activate (GtkMenuItem *menuitem,
gpointer user_data);
plugins/gnome/gnome_interface.c
View file @ 1c99dc85
This diff is collapsed.
plugins/gnome/gnome_interface.h
View file @ 1c99dc85
...@@ -6,4 +6,5 @@ GtkWidget* create_intf_window (void); ...@@ -6,4 +6,5 @@ GtkWidget* create_intf_window (void);
GtkWidget* create_intf_popup (void); GtkWidget* create_intf_popup (void);
GtkWidget* create_intf_about (void); GtkWidget* create_intf_about (void);
GtkWidget* create_intf_fileopen (void); GtkWidget* create_intf_fileopen (void);
GtkWidget* create_intf_modules (void);
GtkWidget* create_intf_playlist (void); GtkWidget* create_intf_playlist (void);
plugins/gnome/gnome_sys.h
View file @ 1c99dc85
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gnome_sys.h: private Gnome interface description * gnome_sys.h: private Gnome interface description
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: gnome_sys.h,v 1.3 2001/02/13 04:29:46 sam Exp $ * $Id: gnome_sys.h,v 1.4 2001/02/14 07:48:18 sam Exp $
* *
* Authors: * Authors:
* *
...@@ -41,6 +41,7 @@ typedef struct intf_sys_s ...@@ -41,6 +41,7 @@ typedef struct intf_sys_s
GtkWidget * p_window; /* main window */ GtkWidget * p_window; /* main window */
GtkWidget * p_popup; /* popup menu */ GtkWidget * p_popup; /* popup menu */
GtkWidget * p_playlist; /* playlist */ GtkWidget * p_playlist; /* playlist */
GtkWidget * p_modules; /* module manager */
GtkWidget * p_about; /* about window */ GtkWidget * p_about; /* about window */
GtkWidget * p_fileopen; /* file open window */ GtkWidget * p_fileopen; /* file open window */
......
plugins/gnome/intf_gnome.c
View file @ 1c99dc85
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_gnome.c: Gnome interface * intf_gnome.c: Gnome interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_gnome.c,v 1.10 2001/02/13 04:29:46 sam Exp $ * $Id: intf_gnome.c,v 1.11 2001/02/14 07:48:18 sam Exp $
* *
* Authors: * Authors:
* *
...@@ -179,6 +179,7 @@ static void intf_Run( intf_thread_t *p_intf ) ...@@ -179,6 +179,7 @@ static void intf_Run( intf_thread_t *p_intf )
/* we don't create these ones yet because we perhaps won't need them */ /* we don't create these ones yet because we perhaps won't need them */
p_intf->p_sys->p_about = NULL; p_intf->p_sys->p_about = NULL;
p_intf->p_sys->p_playlist = NULL; p_intf->p_sys->p_playlist = NULL;
p_intf->p_sys->p_modules = NULL;
p_intf->p_sys->p_fileopen = NULL; p_intf->p_sys->p_fileopen = NULL;
/* store p_sys to keep an eye on it */ /* store p_sys to keep an eye on it */
...@@ -265,7 +266,7 @@ static gint GnomeManage( gpointer p_data ) ...@@ -265,7 +266,7 @@ static gint GnomeManage( gpointer p_data )
vlc_mutex_unlock( &p_intf->p_sys->change_lock ); vlc_mutex_unlock( &p_intf->p_sys->change_lock );
/* prepare to die, young man */ /* Prepare to die, young Skywalker */
gtk_main_quit(); gtk_main_quit();
return( FALSE ); return( FALSE );
} }
......
plugins/gnome/intf_gnome.glade
View file @ 1c99dc85
...@@ -132,14 +132,14 @@ ...@@ -132,14 +132,14 @@
<widget> <widget>
<class>GtkPixmapMenuItem</class> <class>GtkPixmapMenuItem</class>
<name>menubar_plugins</name> <name>menubar_modules</name>
<tooltip>Open the plugin manager</tooltip> <tooltip>Open the plugin manager</tooltip>
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>on_menubar_plugins_activate</handler> <handler>on_menubar_modules_activate</handler>
<last_modification_time>Sun, 11 Feb 2001 16:55:04 GMT</last_modification_time> <last_modification_time>Tue, 13 Feb 2001 17:19:41 GMT</last_modification_time>
</signal> </signal>
<label>_Plugins</label> <label>_Modules</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_ATTACH</stock_icon> <stock_icon>GNOME_STOCK_MENU_ATTACH</stock_icon>
</widget> </widget>
...@@ -429,8 +429,8 @@ ...@@ -429,8 +429,8 @@
<lower>0</lower> <lower>0</lower>
<upper>100</upper> <upper>100</upper>
<step>1</step> <step>1</step>
<page>0</page> <page>5</page>
<page_size>0</page_size> <page_size>1</page_size>
<child> <child>
<padding>0</padding> <padding>0</padding>
<expand>False</expand> <expand>False</expand>
...@@ -631,12 +631,118 @@ Henri Fallon &lt;henri@via.ecp.fr&gt; ...@@ -631,12 +631,118 @@ Henri Fallon &lt;henri@via.ecp.fr&gt;
</widget> </widget>
<widget> <widget>
<class>GtkWindow</class> <class>GnomeDialog</class>
<name>intf_modules</name>
<signal>
<name>destroy</name>
<handler>on_intf_modules_destroy</handler>
<last_modification_time>Tue, 13 Feb 2001 09:19:08 GMT</last_modification_time>
</signal>
<title>Modules</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox1</name>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area1</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkButton</class>
<name>modules_ok</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_modules_ok_clicked</handler>
<last_modification_time>Tue, 13 Feb 2001 09:21:29 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>modules_apply</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_modules_apply_clicked</handler>
<last_modification_time>Tue, 13 Feb 2001 09:21:25 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>modules_cancel</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_modules_cancel_clicked</handler>
<last_modification_time>Tue, 13 Feb 2001 09:21:34 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
<widget>
<class>GtkLabel</class>
<name>label12</name>
<label>Sorry, the module manager isn't functional yet. Please retry in a later version.</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
</widget>
<widget>
<class>GnomeDialog</class>
<name>intf_playlist</name> <name>intf_playlist</name>
<signal> <signal>
<name>destroy</name> <name>destroy</name>
<handler>on_intf_playlist_destroy</handler> <handler>on_intf_playlist_destroy</handler>
<last_modification_time>Mon, 12 Feb 2001 06:02:25 GMT</last_modification_time> <last_modification_time>Tue, 13 Feb 2001 09:18:45 GMT</last_modification_time>
</signal> </signal>
<title>Playlist</title> <title>Playlist</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_TOPLEVEL</type>
...@@ -645,16 +751,72 @@ Henri Fallon &lt;henri@via.ecp.fr&gt; ...@@ -645,16 +751,72 @@ Henri Fallon &lt;henri@via.ecp.fr&gt;
<allow_shrink>False</allow_shrink> <allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow> <allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink> <auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget> <widget>
<class>GtkVBox</class> <class>GtkVBox</class>
<name>vbox1</name> <child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox2</name>
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<spacing>0</spacing> <spacing>8</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area2</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkButton</class>
<name>playlist_ok</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_playlist_ok_clicked</handler>
<last_modification_time>Tue, 13 Feb 2001 09:20:38 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
</widget>
<widget>
<class>GtkLabel</class>
<name>label11</name>
<label>Sorry, the playlist isn't functional yet. Please retry in a later version.</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget> <widget>
<class>GtkScrolledWindow</class> <class>GtkScrolledWindow</class>
<name>scrolledwindow2</name> <name>scrolledwindow3</name>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy> <hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy> <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
...@@ -667,18 +829,18 @@ Henri Fallon &lt;henri@via.ecp.fr&gt; ...@@ -667,18 +829,18 @@ Henri Fallon &lt;henri@via.ecp.fr&gt;
<widget> <widget>
<class>GtkCList</class> <class>GtkCList</class>
<name>clist1</name> <name>clist2</name>
<can_focus>True</can_focus> <can_focus>True</can_focus>
<columns>3</columns> <columns>3</columns>
<column_widths>189,80,80</column_widths> <column_widths>211,49,35</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode> <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles> <show_titles>False</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type> <shadow_type>GTK_SHADOW_IN</shadow_type>
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<child_name>CList:title</child_name> <child_name>CList:title</child_name>
<name>label3</name> <name>label8</name>
<label>Name</label> <label>Name</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
...@@ -691,7 +853,7 @@ Henri Fallon &lt;henri@via.ecp.fr&gt; ...@@ -691,7 +853,7 @@ Henri Fallon &lt;henri@via.ecp.fr&gt;
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<child_name>CList:title</child_name> <child_name>CList:title</child_name>
<name>label4</name> <name>label9</name>
<label>Type</label> <label>Type</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
...@@ -704,7 +866,7 @@ Henri Fallon &lt;henri@via.ecp.fr&gt; ...@@ -704,7 +866,7 @@ Henri Fallon &lt;henri@via.ecp.fr&gt;
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<child_name>CList:title</child_name> <child_name>CList:title</child_name>
<name>label5</name> <name>label10</name>
<label>Length</label> <label>Length</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
...@@ -715,72 +877,6 @@ Henri Fallon &lt;henri@via.ecp.fr&gt; ...@@ -715,72 +877,6 @@ Henri Fallon &lt;henri@via.ecp.fr&gt;
</widget> </widget>
</widget> </widget>
</widget> </widget>
<widget>
<class>GtkHSeparator</class>
<name>hseparator1</name>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
</child>
</widget>
<widget>
<class>GtkHBox</class>
<name>hbox1</name>
<homogeneous>True</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<widget>
<class>GtkButton</class>
<name>button1</name>
<can_focus>True</can_focus>
<label>Wazaaaa !</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkButton</class>
<name>playlist_close</name>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_playlist_close_clicked</handler>
<last_modification_time>Mon, 12 Feb 2001 06:19:17 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkButton</class>
<name>playlist_help</name>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_HELP</stock_button>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
</widget> </widget>
</widget> </widget>
......
plugins/sdl/sdl.c
View file @ 1c99dc85
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include "common.h" /* boolean_t, byte_t */ #include "common.h" /* boolean_t, byte_t */
#include "threads.h" #include "threads.h"
#include "mtime.h" #include "mtime.h"
#include "tests.h"
#include "audio_output.h" #include "audio_output.h"
......
plugins/x11/intf_x11.c deleted 100644 → 0
View file @ 8a1ec969
This diff is collapsed.
plugins/x11/vout_x11.c
View file @ 1c99dc85
This diff is collapsed.
plugins/x11/x11.c
View file @ 1c99dc85
/***************************************************************************** /*****************************************************************************
* x11.c : X11 plugin for vlc * x11.c : X11 plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000 VideoLAN * Copyright (C) 2000, 2001 VideoLAN
*
* Authors:
* *
* Authors: Samuel Hocevar <sam@zoy.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
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
#define MODULE_NAME x11
/***************************************************************************** /*****************************************************************************
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
...@@ -27,109 +29,84 @@ ...@@ -27,109 +29,84 @@
#include <stdlib.h> /* malloc(), free() */ #include <stdlib.h> /* malloc(), free() */
#include <X11/Xlib.h>
#include "config.h" #include "config.h"
#include "common.h" /* boolean_t, byte_t */ #include "common.h" /* boolean_t, byte_t */
#include "threads.h" #include "threads.h"
#include "mtime.h" #include "mtime.h"
#include "tests.h"
#include "plugins.h"
#include "interface.h"
#include "audio_output.h"
#include "video.h" #include "video.h"
#include "video_output.h" #include "video_output.h"
#include "main.h" #include "modules.h"
#include "modules_inner.h"
/***************************************************************************** /*****************************************************************************
* Exported prototypes * Building configuration tree
*****************************************************************************/ *****************************************************************************/
static void vout_GetPlugin( p_vout_thread_t p_vout ); MODULE_CONFIG_START
static void intf_GetPlugin( p_intf_thread_t p_intf ); ADD_WINDOW( "Configuration for X11 module" )
ADD_COMMENT( "For now, the X11 module cannot be configured" )
/* Video output */ MODULE_CONFIG_END
int vout_X11Create ( vout_thread_t *p_vout, char *psz_display,
int i_root_window, void *p_data );
int vout_X11Init ( p_vout_thread_t p_vout );
void vout_X11End ( p_vout_thread_t p_vout );
void vout_X11Destroy ( p_vout_thread_t p_vout );
int vout_X11Manage ( p_vout_thread_t p_vout );
void vout_X11Display ( p_vout_thread_t p_vout );
void vout_X11SetPalette ( p_vout_thread_t p_vout,
u16 *red, u16 *green, u16 *blue, u16 *transp );
/* Interface */
int intf_X11Create ( p_intf_thread_t p_intf );
void intf_X11Destroy ( p_intf_thread_t p_intf );
void intf_X11Manage ( p_intf_thread_t p_intf );
/***************************************************************************** /*****************************************************************************
* GetConfig: get the plugin structure and configuration * Capabilities defined in the other files.
******************************************************************************/
extern void vout_getfunctions( function_list_t * p_function_list );
/*****************************************************************************
* InitModule: get the module structure and configuration.
*****************************************************************************
* We have to fill psz_name, psz_longname and psz_version. These variables
* will be strdup()ed later by the main application because the module can
* be unloaded later to save memory, and we want to be able to access this
* data even after the module has been unloaded.
*****************************************************************************/ *****************************************************************************/
plugin_info_t * GetConfig( void ) int InitModule( module_t * p_module )
{ {
Display *p_display; p_module->psz_name = MODULE_STRING;
plugin_info_t * p_info = (plugin_info_t *) malloc( sizeof(plugin_info_t) ); p_module->psz_longname = "X11 module";
p_module->psz_version = VERSION;
p_info->psz_name = "X Window System";
p_info->psz_version = VERSION;
p_info->psz_author = "the VideoLAN team <vlc@videolan.org>";
p_info->aout_GetPlugin = NULL;
p_info->vout_GetPlugin = vout_GetPlugin;
p_info->intf_GetPlugin = intf_GetPlugin;
p_info->yuv_GetPlugin = NULL;
/* check that we can open the X display */
if( (p_display = XOpenDisplay( XDisplayName(
main_GetPszVariable( VOUT_DISPLAY_VAR, NULL ) ) ))
== NULL )
{
p_info->i_score = 0x0;
}
else
{
XCloseDisplay( p_display );
p_info->i_score = 0x200;
}
if( TestProgram( "xvlc" ) ) p_module->i_capabilities = MODULE_CAPABILITY_NULL
{ | MODULE_CAPABILITY_VOUT;
p_info->i_score += 0x180;
}
/* If this plugin was requested, score it higher */ return( 0 );
if( TestMethod( VOUT_METHOD_VAR, "x11" ) ) }
/*****************************************************************************
* ActivateModule: set the module to an usable state.
*****************************************************************************
* This function fills the capability functions and the configuration
* structure. Once ActivateModule() has been called, the i_usage can
* be set to 0 and calls to NeedModule() be made to increment it. To unload
* the module, one has to wait until i_usage == 0 and call DeactivateModule().
*****************************************************************************/
int ActivateModule( module_t * p_module )
{
p_module->p_functions = malloc( sizeof( module_functions_t ) );
if( p_module->p_functions == NULL )
{ {
p_info->i_score += 0x200; return( -1 );
} }
return( p_info ); vout_getfunctions( &p_module->p_functions->vout );
p_module->p_config = p_config;
return( 0 );
} }
/***************************************************************************** /*****************************************************************************
* Following functions are only called through the p_info structure * DeactivateModule: make sure the module can be unloaded.
*****************************************************************************
* This function must only be called when i_usage == 0. If it successfully
* returns, i_usage can be set to -1 and the module unloaded. Be careful to
* lock usage_lock during the whole process.
*****************************************************************************/ *****************************************************************************/
int DeactivateModule( module_t * p_module )
static void vout_GetPlugin( p_vout_thread_t p_vout )
{ {
p_vout->p_sys_create = vout_X11Create; free( p_module->p_functions );
p_vout->p_sys_init = vout_X11Init;
p_vout->p_sys_end = vout_X11End;
p_vout->p_sys_destroy = vout_X11Destroy;
p_vout->p_sys_manage = vout_X11Manage;
p_vout->p_sys_display = vout_X11Display;
/* optional functions */
p_vout->p_set_palette = vout_X11SetPalette;
}
static void intf_GetPlugin( p_intf_thread_t p_intf ) return( 0 );
{
p_intf->p_sys_create = intf_X11Create;
p_intf->p_sys_destroy = intf_X11Destroy;
p_intf->p_sys_manage = intf_X11Manage;
} }
vlc.spec
View file @ 1c99dc85
Name: vlc Name: vlc
Version: 0.2.50 Version: 0.2.60
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Url: http://www.videolan.org/ Url: http://www.videolan.org/
Group: X11/Applications/Graphics Group: X11/Applications/Graphics
Source0: http://www.videolan.org/packages/0.2.50/vlc_0.2.50-1.tar.gz Source0: http://www.videolan.org/packages/0.2.60/vlc-0.2.60.tar.gz
Packager: Samuel Hocevar <sam@zoy.org> Packager: Samuel Hocevar <sam@zoy.org>
Buildroot: /tmp/vlc-build Buildroot: /tmp/vlc-build
......
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