Commit b9e9cb42 authored by Sam Hocevar's avatar Sam Hocevar

* ./src/playlist/playlist.c: lots of playlist behaviour enhancements.

  * ./src/misc/objects.c: we do not hang on attempt to destroy an object with
    a non-zero reference count, but we still complain.
  * ./plugins/gtk/gtk_control.c, plugins/gtk/gtk_playlist.c: most controls such
    as play, pause, stop, next, fast etc. work again.
  * ./plugins/gtk/gnome_*: got rid of lots of useless wrappers which were a
    workaround for a bug in Glade. Instead, bootstrap.sh does the Glade fixes.
  * ./plugins/ffmpeg/ffmpeg.c: if there is already a video output with the
    appropriate properties, we use it.
parent d547ff04
......@@ -5,6 +5,22 @@
0.5.0
Not released yet
* ./src/playlist/playlist.c: lots of playlist behaviour enhancements.
* ./src/misc/objects.c: we do not hang on attempt to destroy an object with
a non-zero reference count, but we still complain.
* ./plugins/gtk/gtk_control.c, plugins/gtk/gtk_playlist.c: most controls such
as play, pause, stop, next, fast etc. work again.
* ./plugins/gtk/gnome_*: got rid of lots of useless wrappers which were a
workaround for a bug in Glade. Instead, bootstrap.sh does the Glade fixes.
* ./plugins/ffmpeg/ffmpeg.c: if there is already a video output with the
appropriate properties, we use it.
* ./Makefile: minor fix for the BeOS' make-package (icon loss).
* ./plugins/spudec/spu_decoder.c: release vout when we close spudec.
* ./plugins/ac3_spdif/ac3_spdif.c: only report initiliazation error when it
is really an error.
* ./include/video_output.h: added mouse coordinates to vout struct.
* ./plugins/mpeg_vdec/video_parser.c: check that p_vpar->p_vout is available
before detaching it.
* ./plugins/gtk/gtk_callbacks.c: fixed a segfault when switching to
fullscreen from the popup menu.
* ./src/interface/interface.c: interfaces are no longer attached only to
......
#! /bin/sh
## bootstrap.sh file for vlc, the VideoLAN Client
## $Id: bootstrap.sh,v 1.3 2002/06/01 17:11:41 sam Exp $
## $Id: bootstrap.sh,v 1.4 2002/06/07 14:30:40 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -69,6 +69,7 @@ EOF
| sed 's#_("--")#"--"#' \
| sed 's#_("/dev/dvd")#"/dev/dvd"#' \
| sed 's#_(\("./."\))#\1#' \
| sed 's/_GLADE_SUX_\([^,]*\), NULL/, "\1"/' \
>> /tmp/$$.$file.bak
mv -f /tmp/$$.$file.bak plugins/gtk/$file
fi
......
......@@ -2,7 +2,7 @@
* vlc_playlist.h : Playlist functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: playlist.h,v 1.5 2002/06/04 00:11:12 sam Exp $
* $Id: playlist.h,v 1.6 2002/06/07 14:30:40 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -42,20 +42,21 @@ struct playlist_s
{
VLC_COMMON_MEMBERS
/* Thread properties and lock */
vlc_mutex_t change_lock;
int i_index; /* current index */
int i_status;
int i_size; /* total size */
playlist_item_t ** pp_items;
int i_status;
playlist_item_t ** pp_items;
input_thread_t * p_input;
};
/* Used by playlist_Add */
#define PLAYLIST_START 0
#define PLAYLIST_INSERT 0x0001
#define PLAYLIST_REPLACE 0x0002
#define PLAYLIST_APPEND 0x0004
#define PLAYLIST_GO 0x0008
#define PLAYLIST_END -1
/* Playlist parsing mode */
......@@ -91,6 +92,6 @@ void playlist_Destroy ( playlist_t * );
#define playlist_Goto(p,i) playlist_Command(p,PLAYLIST_GOTO,i)
VLC_EXPORT( void, playlist_Command, ( playlist_t *, int, int ) );
VLC_EXPORT( int, playlist_Add, ( playlist_t *, int, const char * ) );
VLC_EXPORT( int, playlist_Add, ( playlist_t *, const char *, int, int ) );
VLC_EXPORT( int, playlist_Delete, ( playlist_t *, int ) );
......@@ -2,7 +2,7 @@
* vlc.h: global header for vlc
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc.h,v 1.2 2002/06/02 13:38:03 gbazin Exp $
* $Id: vlc.h,v 1.3 2002/06/07 14:30:40 sam Exp $
*
* 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
......@@ -91,7 +91,7 @@ vlc_error_t vlc_end ( vlc_t * );
vlc_error_t vlc_destroy ( vlc_t * );
vlc_error_t vlc_add_intf ( vlc_t *, char *, vlc_bool_t );
vlc_error_t vlc_add_target ( vlc_t *, char * );
vlc_error_t vlc_add_target ( vlc_t *, char *, int, int );
vlc_status_t vlc_status ( vlc_t * );
......
......@@ -2,7 +2,7 @@
* vlc_objects.h: vlc_object_t definition.
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: vlc_objects.h,v 1.2 2002/06/02 09:03:53 sam Exp $
* $Id: vlc_objects.h,v 1.3 2002/06/07 14:30:40 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -26,10 +26,11 @@
#define VLC_OBJECT_MODULE (-2)
#define VLC_OBJECT_INTF (-3)
#define VLC_OBJECT_PLAYLIST (-4)
#define VLC_OBJECT_INPUT (-5)
#define VLC_OBJECT_DECODER (-6)
#define VLC_OBJECT_VOUT (-7)
#define VLC_OBJECT_AOUT (-8)
#define VLC_OBJECT_ITEM (-5)
#define VLC_OBJECT_INPUT (-6)
#define VLC_OBJECT_DECODER (-7)
#define VLC_OBJECT_VOUT (-8)
#define VLC_OBJECT_AOUT (-9)
#define VLC_OBJECT_PRIVATE (-666)
/* Object search mode */
......
......@@ -92,7 +92,7 @@ struct module_symbols_s
int (* __network_ChannelJoin_inner) ( vlc_object_t *, int ) ;
int (* __network_ChannelCreate_inner) ( vlc_object_t * ) ;
void (* playlist_Command_inner) ( playlist_t *, int, int ) ;
int (* playlist_Add_inner) ( playlist_t *, int, const char * ) ;
int (* playlist_Add_inner) ( playlist_t *, const char *, int, int ) ;
int (* playlist_Delete_inner) ( playlist_t *, int ) ;
vout_thread_t * (* __vout_CreateThread_inner) ( vlc_object_t *, int, int, u32, int ) ;
void (* vout_DestroyThread_inner) ( vout_thread_t * ) ;
......
......@@ -2,7 +2,7 @@
* avi.c : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: avi.c,v 1.21 2002/06/01 12:31:58 sam Exp $
* $Id: avi.c,v 1.22 2002/06/07 14:30:40 sam Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
......@@ -532,7 +532,6 @@ static int AVIInit( input_thread_t *p_input )
return( -1 );
}
p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
p_input->stream.p_new_program = p_input->stream.pp_programs[0] ;
p_input->stream.i_mux_rate = p_avi_demux->avih.i_maxbytespersec / 50;
vlc_mutex_unlock( &p_input->stream.stream_lock );
......
......@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.12 2002/06/01 18:04:48 sam Exp $
* $Id: ffmpeg.c,v 1.13 2002/06/07 14:30:40 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -375,24 +375,59 @@ static int InitThread( videodec_thread_t *p_vdec )
p_vdec->psz_namecodec );
}
/* create vout */
p_vdec->p_vout = vout_CreateThread( p_vdec->p_fifo,
p_vdec->format.i_width,
p_vdec->format.i_height,
FOURCC_I420,
VOUT_ASPECT_FACTOR * p_vdec->format.i_width /
p_vdec->format.i_height );
/* Spawn a video output if there is none. First we look for our children,
* then we look for any other vout that might be available. */
p_vdec->p_vout = vlc_object_find( p_vdec->p_fifo, VLC_OBJECT_VOUT,
FIND_CHILD );
if( p_vdec->p_vout == NULL )
{
msg_Err( p_vdec->p_fifo, "cannot open vout, aborting" );
avcodec_close( p_vdec->p_context );
msg_Dbg( p_vdec->p_fifo, "ffmpeg codec (%s) stopped",
p_vdec->psz_namecodec );
return -1;
p_vdec->p_vout = vlc_object_find( p_vdec->p_fifo, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
}
if( p_vdec->p_vout )
{
if( p_vdec->p_vout->render.i_width != p_vdec->format.i_width
|| p_vdec->p_vout->render.i_height != p_vdec->format.i_height
|| p_vdec->p_vout->render.i_chroma != FOURCC_I420
|| p_vdec->p_vout->render.i_aspect != VOUT_ASPECT_FACTOR
* p_vdec->format.i_width / p_vdec->format.i_height )
{
/* We are not interested in this format, close this vout */
vlc_object_detach_all( p_vdec->p_vout );
vlc_object_release( p_vdec->p_vout );
vout_DestroyThread( p_vdec->p_vout );
p_vdec->p_vout = NULL;
}
else
{
/* This video output is cool! Hijack it. */
vlc_object_detach_all( p_vdec->p_vout );
vlc_object_attach( p_vdec->p_vout, p_vdec->p_fifo );
vlc_object_release( p_vdec->p_vout );
}
}
vlc_object_yield( p_vdec->p_vout );
if( p_vdec->p_vout == NULL )
{
msg_Dbg( p_vdec->p_fifo, "no vout present, spawning one" );
p_vdec->p_vout = vout_CreateThread( p_vdec->p_fifo,
p_vdec->format.i_width,
p_vdec->format.i_height,
FOURCC_I420,
VOUT_ASPECT_FACTOR * p_vdec->format.i_width /
p_vdec->format.i_height );
/* Everything failed */
if( p_vdec->p_vout == NULL )
{
msg_Err( p_vdec->p_fifo, "cannot open vout, aborting" );
avcodec_close( p_vdec->p_context );
p_vdec->p_fifo->b_error = 1;
return -1;
}
}
return( 0 );
}
......@@ -418,8 +453,12 @@ static void EndThread( videodec_thread_t *p_vdec )
p_vdec->psz_namecodec );
}
vlc_object_release( p_vdec->p_vout );
vout_DestroyThread( p_vdec->p_vout );
if( p_vdec->p_vout != NULL )
{
/* We are about to die. Reattach video output to p_vlc. */
vlc_object_detach( p_vdec->p_vout, p_vdec->p_fifo );
vlc_object_attach( p_vdec->p_vout, p_vdec->p_fifo->p_vlc );
}
free( p_vdec );
}
......
......@@ -2,7 +2,7 @@
* gnome.c : Gnome plugin for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: gnome.c,v 1.26 2002/06/02 09:03:54 sam Exp $
* $Id: gnome.c,v 1.27 2002/06/07 14:30:40 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -180,6 +180,11 @@ static int intf_Open( intf_thread_t *p_intf )
*****************************************************************************/
static void intf_Close( intf_thread_t *p_intf )
{
if( p_intf->p_sys->p_input )
{
vlc_object_release( p_intf->p_sys->p_input );
}
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
/* Destroy structure */
......@@ -222,7 +227,7 @@ static void intf_Run( intf_thread_t *p_intf )
/* Create some useful widgets that will certainly be used */
p_intf->p_sys->p_window = create_intf_window( );
p_intf->p_sys->p_popup = create_intf_popup( );
p_intf->p_sys->p_playlist = create_intf_playlist();
p_intf->p_sys->p_playwin = create_intf_playlist();
p_intf->p_sys->p_messages = create_intf_messages();
/* Set the title of the main window */
......@@ -235,7 +240,7 @@ static void intf_Run( intf_thread_t *p_intf )
1, GDK_ACTION_COPY );
/* Accept file drops on the playlist window */
gtk_drag_dest_set( GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
p_intf->p_sys->p_playlist ), "playlist_clist") ),
p_intf->p_sys->p_playwin ), "playlist_clist") ),
GTK_DEST_DEFAULT_ALL, target_table,
1, GDK_ACTION_COPY );
......@@ -298,7 +303,7 @@ static void intf_Run( intf_thread_t *p_intf )
gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_popup),
"p_intf", p_intf );
gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_playlist ),
gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_playwin ),
"p_intf", p_intf );
gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_messages ),
......
......@@ -92,7 +92,7 @@
<tooltip>Open a File</tooltip>
<signal>
<name>activate</name>
<handler>GnomeMenubarFileOpenActivate</handler>
<handler>GtkFileOpenShow_GLADE_SUX_intf_window</handler>
<last_modification_time>Sat, 19 May 2001 16:27:02 GMT</last_modification_time>
</signal>
<label>_Open File...</label>
......@@ -106,7 +106,7 @@
<tooltip>Open a DVD or VCD</tooltip>
<signal>
<name>activate</name>
<handler>GnomeMenubarDiscOpenActivate</handler>
<handler>GtkDiscOpenShow_GLADE_SUX_intf_window</handler>
<last_modification_time>Sat, 19 May 2001 16:27:10 GMT</last_modification_time>
</signal>
<label>Open _Disc...</label>
......@@ -120,7 +120,7 @@
<tooltip>Select a Network Stream</tooltip>
<signal>
<name>activate</name>
<handler>GnomeMenubarNetworkOpenActivate</handler>
<handler>GtkNetworkOpenShow_GLADE_SUX_intf_window</handler>
<last_modification_time>Fri, 21 Dec 2001 13:11:28 GMT</last_modification_time>
</signal>
<label>_Network Stream...</label>
......@@ -140,7 +140,7 @@
<tooltip>Eject disc</tooltip>
<signal>
<name>activate</name>
<handler>GnomeMenubarDiscEjectActivate</handler>
<handler>GtkDiscEject_GLADE_SUX_intf_window</handler>
<last_modification_time>Fri, 21 Dec 2001 13:11:28 GMT</last_modification_time>
</signal>
<label>_Eject Disc</label>
......@@ -159,7 +159,7 @@
<name>menubar_exit</name>
<signal>
<name>activate</name>
<handler>GnomeMenubarExitActivate</handler>
<handler>GtkExit_GLADE_SUX_intf_window</handler>
<last_modification_time>Sat, 19 May 2001 16:27:52 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_EXIT_ITEM</stock_item>
......@@ -181,7 +181,7 @@
<name>menubar_hide_interface</name>
<signal>
<name>activate</name>
<handler>GnomeMenubarWindowToggleActivate</handler>
<handler>GtkWindowToggle_GLADE_SUX_intf_window</handler>
<last_modification_time>Sat, 19 May 2001 16:28:06 GMT</last_modification_time>
</signal>
<label>_Hide interface</label>
......@@ -193,7 +193,7 @@
<name>menubar_fullscreen</name>
<signal>
<name>activate</name>
<handler>GnomeMenubarFullscreenActivate</handler>
<handler>GtkFullscreen_GLADE_SUX_intf_window</handler>
<last_modification_time>Sat, 19 May 2001 16:28:15 GMT</last_modification_time>
</signal>
<label>_Fullscreen</label>
......@@ -245,7 +245,7 @@
<tooltip>Open the playlist window</tooltip>
<signal>
<name>activate</name>
<handler>GnomeMenubarPlaylistActivate</handler>
<handler>GtkPlaylistShow_GLADE_SUX_intf_window</handler>
<last_modification_time>Sat, 19 May 2001 16:28:41 GMT</last_modification_time>
</signal>
<label>_Playlist...</label>
......@@ -260,7 +260,7 @@
<tooltip>Open the module manager</tooltip>
<signal>
<name>activate</name>
<handler>GnomeMenubarModulesActivate</handler>
<handler>GtkModulesShow_GLADE_SUX_intf_window</handler>
<last_modification_time>Sat, 19 May 2001 16:28:53 GMT</last_modification_time>
</signal>
<label>_Modules...</label>
......@@ -274,7 +274,7 @@
<tooltip>Open the messages window</tooltip>
<signal>
<name>activate</name>
<handler>GnomeMenubarMessagesActivate</handler>
<handler>GtkMessagesShow_GLADE_SUX_intf_window</handler>
<last_modification_time>Wed, 20 Feb 2002 05:43:55 GMT</last_modification_time>
</signal>
<label>Messages...</label>
......@@ -321,7 +321,7 @@
<name>menubar_preferences</name>
<signal>
<name>activate</name>
<handler>GnomeMenubarPreferencesActivate</handler>
<handler>GtkPreferencesShow_GLADE_SUX_intf_window</handler>
<last_modification_time>Sat, 19 May 2001 16:29:03 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_PREFERENCES_ITEM</stock_item>
......@@ -343,7 +343,7 @@
<name>menubar_about</name>
<signal>
<name>activate</name>
<handler>GnomeMenubarAboutActivate</handler>
<handler>GtkAboutShow_GLADE_SUX_intf_window</handler>
<last_modification_time>Sat, 19 May 2001 16:29:19 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_ABOUT_ITEM</stock_item>
......@@ -384,7 +384,7 @@
<name>toolbar_file</name>
<tooltip>Open a File</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkFileOpenShow</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:14:43 GMT</last_modification_time>
......@@ -399,7 +399,7 @@
<name>toolbar_disc</name>
<tooltip>Open a DVD or VCD</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkDiscOpenShow</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:14:38 GMT</last_modification_time>
......@@ -414,7 +414,7 @@
<name>toolbar_network</name>
<tooltip>Select a Network Stream</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkNetworkOpenShow</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:14:33 GMT</last_modification_time>
......@@ -429,7 +429,7 @@
<name>toolbar_sat</name>
<tooltip>Open a Satellite Card</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkSatOpenShow</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 25 Mar 2002 01:02:49 GMT</last_modification_time>
......@@ -445,7 +445,7 @@
<sensitive>False</sensitive>
<tooltip>Go Backward</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkControlBack</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:14:27 GMT</last_modification_time>
......@@ -463,7 +463,7 @@
<name>toolbar_stop</name>
<tooltip>Stop Stream</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkControlStop</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:14:22 GMT</last_modification_time>
......@@ -478,7 +478,7 @@
<name>toolbar_eject</name>
<tooltip>Eject disc</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkDiscEject</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Fri, 21 Dec 2001 15:24:18 GMT</last_modification_time>
......@@ -493,10 +493,10 @@
<name>toolbar_play</name>
<tooltip>Play Stream</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkControlPlay</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:14:17 GMT</last_modification_time>
<last_modification_time>Wed, 05 Jun 2002 15:10:19 GMT</last_modification_time>
</signal>
<label>Play</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_FORWARD</stock_pixmap>
......@@ -509,7 +509,7 @@
<sensitive>False</sensitive>
<tooltip>Pause Stream</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkControlPause</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:14:05 GMT</last_modification_time>
......@@ -525,7 +525,7 @@
<sensitive>False</sensitive>
<tooltip>Play Slower</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkControlSlow</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:13:58 GMT</last_modification_time>
......@@ -544,7 +544,7 @@
<sensitive>False</sensitive>
<tooltip>Play Faster</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkControlFast</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:13:53 GMT</last_modification_time>
......@@ -559,7 +559,7 @@
<name>toolbar_playlist</name>
<tooltip>Open Playlist</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkPlaylistShow</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:13:48 GMT</last_modification_time>
......@@ -574,7 +574,7 @@
<name>toolbar_prev</name>
<tooltip>Previous File</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkPlaylistPrev</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:13:44 GMT</last_modification_time>
......@@ -589,7 +589,7 @@
<name>toolbar_next</name>
<tooltip>Next File</tooltip>
<signal>
<name>button_press_event</name>
<name>clicked</name>
<handler>GtkPlaylistNext</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Sat, 19 May 2001 03:13:40 GMT</last_modification_time>
......@@ -1021,7 +1021,7 @@
<name>popup_play</name>
<signal>
<name>activate</name>
<handler>GnomePopupPlayActivate</handler>
<handler>GtkControlPlay_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:16:58 GMT</last_modification_time>
</signal>
......@@ -1035,7 +1035,7 @@
<name>popup_pause</name>
<signal>
<name>activate</name>
<handler>GnomePopupPauseActivate</handler>
<handler>GtkControlPause_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:17:31 GMT</last_modification_time>
</signal>
......@@ -1049,7 +1049,7 @@
<name>popup_stop</name>
<signal>
<name>activate</name>
<handler>GnomePopupStopActivate</handler>
<handler>GtkControlStop_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:18:10 GMT</last_modification_time>
</signal>
......@@ -1064,7 +1064,7 @@
<sensitive>False</sensitive>
<signal>
<name>activate</name>
<handler>GnomePopupBackActivate</handler>
<handler>GtkControlBack_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:18:21 GMT</last_modification_time>
</signal>
......@@ -1078,7 +1078,7 @@
<name>popup_slow</name>
<signal>
<name>activate</name>
<handler>GnomePopupSlowActivate</handler>
<handler>GtkControlSlow_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:18:29 GMT</last_modification_time>
</signal>
......@@ -1092,7 +1092,7 @@
<name>popup_fast</name>
<signal>
<name>activate</name>
<handler>GnomePopupFastActivate</handler>
<handler>GtkControlFast_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:18:37 GMT</last_modification_time>
</signal>
......@@ -1112,7 +1112,7 @@
<name>popup_interface_toggle</name>
<signal>
<name>activate</name>
<handler>GnomePopupWindowToggleActivate</handler>
<handler>GtkWindowToggle_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:18:51 GMT</last_modification_time>
</signal>
......@@ -1126,7 +1126,7 @@
<tooltip>Toggle fullscreen mode</tooltip>
<signal>
<name>activate</name>
<handler>GnomePopupFullscreenActivate</handler>
<handler>GtkFullscreen_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:19:07 GMT</last_modification_time>
</signal>
......@@ -1145,7 +1145,7 @@
<name>popup_next</name>
<signal>
<name>activate</name>
<handler>GnomePopupNextActivate</handler>
<handler>GtkPlaylistNext_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:19:18 GMT</last_modification_time>
</signal>
......@@ -1158,7 +1158,7 @@
<name>popup_prev</name>
<signal>
<name>activate</name>
<handler>GnomePopupPrevActivate</handler>
<handler>GtkPlaylistPrev_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:19:26 GMT</last_modification_time>
</signal>
......@@ -1172,7 +1172,7 @@
<tooltip>Got directly so specified point</tooltip>
<signal>
<name>activate</name>
<handler>GnomePopupJumpActivate</handler>
<handler>GtkJumpShow_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:34:46 GMT</last_modification_time>
</signal>
......@@ -1241,7 +1241,7 @@
<tooltip>Open a File</tooltip>
<signal>
<name>activate</name>
<handler>GnomePopupFileOpenActivate</handler>
<handler>GtkFileOpenShow_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:20:08 GMT</last_modification_time>
</signal>
......@@ -1256,7 +1256,7 @@
<tooltip>Open a DVD or VCD</tooltip>
<signal>
<name>activate</name>
<handler>GnomePopupDiscOpenActivate</handler>
<handler>GtkDiscOpenShow_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:20:44 GMT</last_modification_time>
</signal>
......@@ -1271,7 +1271,7 @@
<tooltip>Select a Network Stream</tooltip>
<signal>
<name>activate</name>
<handler>GnomePopupNetworkOpenActivate</handler>
<handler>GtkNetworkOpenShow_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:20:54 GMT</last_modification_time>
</signal>
......@@ -1291,7 +1291,7 @@
<name>popup_about</name>
<signal>
<name>activate</name>
<handler>GnomePopupAboutActivate</handler>
<handler>GtkAboutShow_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:21:02 GMT</last_modification_time>
</signal>
......@@ -1305,7 +1305,7 @@
<name>popup_playlist</name>
<signal>
<name>activate</name>
<handler>GnomePopupPlaylistActivate</handler>
<handler>GtkPlaylistShow_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:21:14 GMT</last_modification_time>
</signal>
......@@ -1318,7 +1318,7 @@
<name>popup_preferences</name>
<signal>
<name>activate</name>
<handler>GnomePopupPreferencesActivate</handler>
<handler>GtkPreferencesShow_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:21:25 GMT</last_modification_time>
</signal>
......@@ -1336,7 +1336,7 @@
<name>popup_exit</name>
<signal>
<name>activate</name>
<handler>GnomePopupExitActivate</handler>
<handler>GtkExit_GLADE_SUX_intf_popup</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:21:45 GMT</last_modification_time>
</signal>
......@@ -2613,7 +2613,7 @@ http://www.videolan.org/
<name>playlist_add_disc</name>
<signal>
<name>activate</name>
<handler>GnomePlaylistDiscOpenActivate</handler>
<handler>GtkDiscOpenShow_GLADE_SUX_intf_playlist</handler>
<data>&quot;intf_playlist&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:22:26 GMT</last_modification_time>
</signal>
......@@ -2626,7 +2626,7 @@ http://www.videolan.org/
<name>playlist_add_file</name>
<signal>
<name>activate</name>
<handler>GnomePlaylistFileOpenActivate</handler>
<handler>GtkFileOpenShow_GLADE_SUX_intf_playlist</handler>
<data>&quot;intf_playlist&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:22:37 GMT</last_modification_time>
</signal>
......@@ -2639,7 +2639,7 @@ http://www.videolan.org/
<name>playlist_add_network</name>
<signal>
<name>activate</name>
<handler>GnomePlaylistNetworkOpenActivate</handler>
<handler>GtkNetworkOpenShow_GLADE_SUX_intf_playlist</handler>
<data>&quot;intf_playlist&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:22:52 GMT</last_modification_time>
</signal>
......
......@@ -2,7 +2,7 @@
* gnome_callbacks.c : GNOME-specific callbacks.
*****************************************************************************
* Copyright (C) 2000, 2001, 2002 VideoLAN
* $Id: gnome_callbacks.c,v 1.11 2002/06/04 20:33:25 sam Exp $
* $Id: gnome_callbacks.c,v 1.12 2002/06/07 14:30:40 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
......@@ -23,280 +23,5 @@
*****************************************************************************/
/*****************************************************************************
* Preamble
* This file is not needed: everything is in gtk_callbacks.c
*****************************************************************************/
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include "gnome_callbacks.h"
#include "gnome_interface.h"
#include "gnome_support.h"
#include <gnome.h>
/*
* These wrappers are made necessary by a bug in glade that seems not
* to put user_data in c source of menuitems.
*/
void
GnomeMenubarFileOpenActivate (GtkMenuItem *menuitem,
gpointer user_data)
{
GtkFileOpenShow( GTK_WIDGET( menuitem ), NULL, "intf_window" );
}
void
GnomeMenubarDiscOpenActivate (GtkMenuItem *menuitem,
gpointer user_data)
{
GtkDiscOpenShow( GTK_WIDGET( menuitem ), NULL, "intf_window" );