Skip to content

V
vlc
Commit 58ca65ac authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Removal of gnome_main, gnome2_main, gtk_main, gtk2_main, pda modules 

Those hardly build and do not work anymore since a long time. Noone seems to care...
Farewell!
parent e9825663
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 7597 deletions
NEWS
View file @ 58ca65ac
...@@ -45,6 +45,7 @@ Removed modules: ...@@ -45,6 +45,7 @@ Removed modules:
* showintf * showintf
* transrate * transrate
* x11, xvideo, xvid * x11, xvideo, xvid
* gtk_main, gtk_main2, gnome_main, gnome_main2 and pda interface
Changes between 1.0.0 and 1.0.1: Changes between 1.0.0 and 1.0.1:
......
configure.ac
View file @ 58ca65ac
...@@ -479,7 +479,7 @@ if test "${SYS}" = "mingw32" ...@@ -479,7 +479,7 @@ if test "${SYS}" = "mingw32"
then then
AC_CHECK_LIB(mingwex,opendir, AC_CHECK_LIB(mingwex,opendir,
AC_CHECK_LIB(mingw32,opendir,, AC_CHECK_LIB(mingw32,opendir,,
[VLC_ADD_LIBS([libvlccore gtk],[-lmingwex])]) [VLC_ADD_LIBS([libvlccore],[-lmingwex])])
) )
fi fi
...@@ -987,12 +987,6 @@ fi ...@@ -987,12 +987,6 @@ fi
;; ;;
esac esac
dnl Build the gtk_main plugins?
NEED_GTK_MAIN=no
NEED_GNOME_MAIN=no
NEED_GTK2_MAIN=no
NEED_GNOME2_MAIN=no
dnl build the qte plugin ? dnl build the qte plugin ?
NEED_QTE_MAIN=no NEED_QTE_MAIN=no
...@@ -4269,28 +4263,6 @@ AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" || ...@@ -4269,28 +4263,6 @@ AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" ||
(test "${SYS}" != "darwin" && test "${SYS}" != "beos" && (test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")]) test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
dnl
dnl PDA Gtk+2 module
dnl
AC_ARG_ENABLE(pda,
[ --enable-pda PDA interface needs Gtk2 support (default disabled)])
if test "${enable_pda}" = "yes"
then
PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
VLC_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
VLC_ADD_LIBS([gtk2],[${GTK2_LIBS}])
VLC_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}])
VLC_ADD_LIBS([pda],[${LDFLAGS_pda}])
VLC_ADD_LIBS([pda],[${GTK2_LIBS}])
VLC_ADD_PLUGIN([pda])
if test "${SYS}" != "mingw32"; then
NEED_GTK2_MAIN=yes
VLC_ADD_CFLAGS([gtk2_main],[$GTK2_CFLAGS])
VLC_ADD_LIBS([gtk2_main],[$GTK2_LIBS])
fi
fi
AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"])
dnl dnl
dnl Maemo dnl Maemo
dnl dnl
...@@ -4972,39 +4944,6 @@ then ...@@ -4972,39 +4944,6 @@ then
VLC_ADD_PLUGIN([test4]) VLC_ADD_PLUGIN([test4])
fi fi
dnl
dnl gtk_main plugin
dnl
if test "${NEED_GTK_MAIN}" != "no"
then
VLC_ADD_PLUGIN([gtk_main])
VLC_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk}])
VLC_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk}])
fi
if test "${NEED_GNOME_MAIN}" != "no"
then
VLC_ADD_PLUGIN([gnome_main])
VLC_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_gnome}])
VLC_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_gnome}])
fi
if test "${NEED_GTK2_MAIN}" != "no"
then
VLC_ADD_PLUGIN([gtk2_main])
VLC_ADD_CFLAGS([gtk2],[-DNEED_GTK2_MAIN])
VLC_ADD_CFLAGS([pda],[-DNEED_GTK2_MAIN])
VLC_ADD_CFLAGS([gtk2_main],[${CFLAGS_gtk2} ${CFLAGS_pda}])
VLC_ADD_LDFLAGS([gtk2_main],[${LDFLAGS_gtk2} ${LDFLAGS_pda}])
fi
if test "${NEED_GNOME2_MAIN}" != "no"
then
VLC_ADD_PLUGIN([gnome2_main])
VLC_ADD_CFLAGS([gnome2_main],[${CFLAGS_gtk2} ${CFLAGS_gnome2}])
VLC_ADD_LDFLAGS([gnome2_main],[${LDFLAGS_gtk2} ${LDFLAGS_gnome2}])
fi
dnl dnl
dnl qte_main plugin dnl qte_main plugin
dnl dnl
...@@ -5194,7 +5133,6 @@ AC_CONFIG_FILES([ ...@@ -5194,7 +5133,6 @@ AC_CONFIG_FILES([
modules/demux/playlist/Makefile modules/demux/playlist/Makefile
modules/gui/Makefile modules/gui/Makefile
modules/gui/beos/Makefile modules/gui/beos/Makefile
modules/gui/pda/Makefile
modules/gui/macosx/Makefile modules/gui/macosx/Makefile
modules/gui/maemo/Makefile modules/gui/maemo/Makefile
modules/gui/minimal_macosx/Makefile modules/gui/minimal_macosx/Makefile
......
modules/LIST
View file @ 58ca65ac
...@@ -124,8 +124,6 @@ $Id$ ...@@ -124,8 +124,6 @@ $Id$
* glwin32: a opengl provider using DirectX OpenGL * glwin32: a opengl provider using DirectX OpenGL
* glx: a opengl provider using X11 OpenGL * glx: a opengl provider using X11 OpenGL
* gme: game music files demuxer * gme: game music files demuxer
* gnome2_main: Gtk+ wrapper for gtk_main
* gnome_main: Gtk+ wrapper for gtk_main
* gnutls: GNU TLS encryption/decryption module * gnutls: GNU TLS encryption/decryption module
* goom: visualisation plugin based on goom * goom: visualisation plugin based on goom
* gradient: Gradient and edge detection video effects filter * gradient: Gradient and edge detection video effects filter
...@@ -133,8 +131,6 @@ $Id$ ...@@ -133,8 +131,6 @@ $Id$
* grey_yuv: grayscale to others conversion module * grey_yuv: grayscale to others conversion module
* growl: announce currently playing stream to growl * growl: announce currently playing stream to growl
* growl_udp: growl UDP notification plugin * growl_udp: growl UDP notification plugin
* gtk2_main: Gtk+ wrapper for gtk_main
* gtk_main: Gtk+ wrapper for gtk_main
* h264: H264 decoder * h264: H264 decoder
* hal: Linux HAL services discovery module * hal: Linux HAL services discovery module
* hd1000a: audio output module for the Roku HD1000 Set-Top-Box * hd1000a: audio output module for the Roku HD1000 Set-Top-Box
...@@ -240,7 +236,6 @@ $Id$ ...@@ -240,7 +236,6 @@ $Id$
* packetizer_vc1: VC-1 video packetizer * packetizer_vc1: VC-1 video packetizer
* panoramix: image wall panoramic video with edge blending filter * panoramix: image wall panoramic video with edge blending filter
* param_eq: parametric equalizer * param_eq: parametric equalizer
* pda: interface for iPaq using the Gtk2+ widget set
* playlist: playlist import module * playlist: playlist import module
* png: PNG images decoder * png: PNG images decoder
* podcast: podcast feed parser * podcast: podcast feed parser
......
modules/gui/Modules.am
View file @ 58ca65ac
...@@ -10,9 +10,6 @@ endif ...@@ -10,9 +10,6 @@ endif
if BUILD_MAEMO if BUILD_MAEMO
SUBDIRS += maemo SUBDIRS += maemo
endif endif
if BUILD_PDA
SUBDIRS += pda
endif
SUBDIRS += qnx SUBDIRS += qnx
if ENABLE_QT4 if ENABLE_QT4
SUBDIRS += qt4 SUBDIRS += qt4
......
modules/gui/pda/Modules.am deleted 100644 → 0
View file @ e9825663
SOURCES_pda = \
pda.c \
pda.h \
pda_interface.c \
pda_interface.h \
pda_support.c \
pda_support.h \
pda_callbacks.c \
pda_callbacks.h \
$(NULL)
EXTRA_DIST += pda.glade \
pda.gladep \
$(NULL)
modules/gui/pda/pda.c deleted 100644 → 0
View file @ e9825663
This diff is collapsed.
modules/gui/pda/pda.glade deleted 100644 → 0
View file @ e9825663
This source diff could not be displayed because it is too large. You can view the blob instead.
modules/gui/pda/pda.gladep deleted 100644 → 0
View file @ e9825663
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
<glade-project>
<name>Pda</name>
<program_name>pda</program_name>
<source_directory></source_directory>
<pixmaps_directory>../../../share</pixmaps_directory>
<gnome_support>FALSE</gnome_support>
<use_widget_names>TRUE</use_widget_names>
<output_main_file>FALSE</output_main_file>
<output_build_files>FALSE</output_build_files>
<main_source_file>pda_interface.c</main_source_file>
<main_header_file>pda_interface.h</main_header_file>
<handler_source_file>pda_callbacks.c</handler_source_file>
<handler_header_file>pda_callbacks.h</handler_header_file>
<support_source_file>pda_support.c</support_source_file>
<support_header_file>pda_support.h</support_header_file>
</glade-project>
modules/gui/pda/pda.h deleted 100644 → 0
View file @ e9825663
/*****************************************************************************
* pda.h: private Gtk+ interface description
*****************************************************************************
* Copyright (C) 1999, 2000 the VideoLAN team
* $Id$
*
* Authors: Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#define MAX_ATEXIT 10
/*****************************************************************************
* intf_sys_t: description and status of Gtk+ interface
*****************************************************************************/
struct intf_sys_t
{
/* The gtk_main module */
module_t *p_gtk_main;
/* windows and widgets */
GtkWidget *p_window; /* main window */
GtkNotebook *p_notebook;
GtkHScale *p_slider;
GtkTreeView *p_tvfile;
GtkTreeView *p_tvplaylist;
/* slider */
GtkLabel * p_slider_label;
GtkAdjustment * p_adj; /* slider adjustment object */
off_t i_adj_oldvalue; /* previous value -no FPU hardware */
float f_adj_oldvalue; /* previous value -with FPU hardware*/
/* special actions */
bool b_playing;
bool b_window_changed; /* window display toggled ? */
bool b_slider_free; /* slider status */
/* Preference settings */
bool b_autoplayfile;
/* The input thread */
input_thread_t * p_input;
};
/*****************************************************************************
* Useful macro
****************************************************************************/
#define GTK_GET( type, nom ) GTK_##type( gtk_object_get_data( \
GTK_OBJECT( p_intf->p_sys->p_window ), nom ) )
#define GtkGetIntf( widget ) __GtkGetIntf( GTK_WIDGET( widget ) )
void * __GtkGetIntf( GtkWidget * );
modules/gui/pda/pda_callbacks.c deleted 100644 → 0
View file @ e9825663
This diff is collapsed.
modules/gui/pda/pda_callbacks.h deleted 100644 → 0
View file @ e9825663
/*****************************************************************************
* callbacks.h : pda plugin for vlc
*****************************************************************************
* Copyright (C) 2003 the VideoLAN team
* $Id$
*
* Authors: Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <gtk/gtk.h>
#include <vlc_common.h>
#include <vlc_interface.h>
void ReadDirectory( intf_thread_t *p_intf, GtkListStore *p_list, char *psz_dir );
void PlaylistRebuildListStore( intf_thread_t *p_intf, GtkListStore *p_list, playlist_t * p_playlist );
gboolean
onPDADeleteEvent (GtkWidget *widget,
GdkEvent *event,
gpointer user_data);
void
onRewind (GtkButton *button,
gpointer user_data);
void
onPause (GtkButton *button,
gpointer user_data);
void
onPlay (GtkButton *button,
gpointer user_data);
void
onStop (GtkButton *button,
gpointer user_data);
void
onForward (GtkButton *button,
gpointer user_data);
void
onAbout (GtkButton *button,
gpointer user_data);
gboolean
SliderRelease (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data);
gboolean
SliderPress (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data);
void
onFileListRow (GtkTreeView *treeview,
GtkTreePath *path,
GtkTreeViewColumn *column,
gpointer user_data);
void
onAddFileToPlaylist (GtkButton *button,
gpointer user_data);
void
onAddNetworkPlaylist (GtkButton *button,
gpointer user_data);
void
onAddCameraToPlaylist (GtkButton *button,
gpointer user_data);
gboolean
PlaylistEvent (GtkWidget *widget,
GdkEvent *event,
gpointer user_data);
void
onPlaylistColumnsChanged (GtkTreeView *treeview,
gpointer user_data);
gboolean
onPlaylistRowSelected (GtkTreeView *treeview,
gboolean start_editing,
gpointer user_data);
void
onPlaylistRow (GtkTreeView *treeview,
GtkTreePath *path,
GtkTreeViewColumn *column,
gpointer user_data);
void
onUpdatePlaylist (GtkButton *button,
gpointer user_data);
void
onDeletePlaylist (GtkButton *button,
gpointer user_data);
void
onClearPlaylist (GtkButton *button,
gpointer user_data);
void
onPreferenceSave (GtkButton *button,
gpointer user_data);
void
onPreferenceApply (GtkButton *button,
gpointer user_data);
void
onPreferenceCancel (GtkButton *button,
gpointer user_data);
void
NetworkBuildMRL (GtkEditable *editable,
gpointer user_data);
void
onAddTranscodeToPlaylist (GtkButton *button,
gpointer user_data);
void
onEntryStdAccessChanged (GtkEditable *editable,
gpointer user_data);
void
SliderMove (GtkRange *range,
GtkScrollType scroll,
gpointer user_data);
modules/gui/pda/pda_interface.c deleted 100644 → 0
View file @ e9825663
This diff is collapsed.
modules/gui/pda/pda_interface.h deleted 100644 → 0
View file @ e9825663
/*
* DO NOT EDIT THIS FILE - it is generated by Glade.
*/
GtkWidget* create_pda (void);
modules/gui/pda/pda_support.c deleted 100644 → 0
View file @ e9825663
/*
* DO NOT EDIT THIS FILE - it is generated by Glade.
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
#include <gtk/gtk.h>
#include "pda_support.h"
GtkWidget*
lookup_widget (GtkWidget *widget,
const gchar *widget_name)
{
GtkWidget *parent, *found_widget;
for (;;)
{
if (GTK_IS_MENU (widget))
parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
else
parent = widget->parent;
if (!parent)
parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
if (parent == NULL)
break;
widget = parent;
}
found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
widget_name);
if (!found_widget)
g_warning ("Widget not found: %s", widget_name);
return found_widget;
}
static GList *pixmaps_directories = NULL;
/* Use this function to set the directory containing installed pixmaps. */
void
add_pixmap_directory (const gchar *directory)
{
pixmaps_directories = g_list_prepend (pixmaps_directories,
g_strdup (directory));
}
/* This is an internally used function to find pixmap files. */
static gchar*
find_pixmap_file (const gchar *filename)
{
GList *elem;
/* We step through each of the pixmaps directory to find it. */
elem = pixmaps_directories;
while (elem)
{
gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data,
G_DIR_SEPARATOR_S, filename);
if (g_file_test (pathname, G_FILE_TEST_EXISTS))
return pathname;
g_free (pathname);
elem = elem->next;
}
return NULL;
}
/* This is an internally used function to create pixmaps. */
GtkWidget*
create_pixmap (GtkWidget *widget,
const gchar *filename)
{
(void) widget;
gchar *pathname = NULL;
GtkWidget *pixmap;
if (!filename || !filename[0])
return gtk_image_new ();
pathname = find_pixmap_file (filename);
if (!pathname)
{
g_warning (_("Couldn't find pixmap file: %s"), filename);
return gtk_image_new ();
}
pixmap = gtk_image_new_from_file (pathname);
g_free (pathname);
return pixmap;
}
/* This is an internally used function to create pixmaps. */
GdkPixbuf*
create_pixbuf (const gchar *filename)
{
gchar *pathname = NULL;
GdkPixbuf *pixbuf;
GError *error = NULL;
if (!filename || !filename[0])
return NULL;
pathname = find_pixmap_file (filename);
if (!pathname)
{
g_warning (_("Couldn't find pixmap file: %s"), filename);
return NULL;
}
pixbuf = gdk_pixbuf_new_from_file (pathname, &error);
if (!pixbuf)
{
fprintf (stderr, "Failed to load pixbuf file: %s: %s\n",
pathname, error->message);
g_error_free (error);
}
g_free (pathname);
return pixbuf;
}
/* This is used to set ATK action descriptions. */
void
glade_set_atk_action_description (AtkAction *action,
const gchar *action_name,
const gchar *description)
{
gint n_actions, i;
n_actions = atk_action_get_n_actions (action);
for (i = 0; i < n_actions; i++)
{
if (!strcmp (atk_action_get_name (action, i), action_name))
atk_action_set_description (action, i, description);
}
}
modules/gui/pda/pda_support.h deleted 100644 → 0
View file @ e9825663
/*
* DO NOT EDIT THIS FILE - it is generated by Glade.
*/
#include <gtk/gtk.h>
/*
* Standard gettext macros.
*/
#ifdef ENABLE_NLS
# include <libintl.h>
# undef _
# define _(String) dgettext (PACKAGE, String)
#endif
/*
* Public Functions.
*/
/*
* This function returns a widget in a component created by Glade.
* Call it with the toplevel widget in the component (i.e. a window/dialog),
* or alternatively any widget in the component, and the name of the widget
* you want returned.
*/
GtkWidget* lookup_widget (GtkWidget *widget,
const gchar *widget_name);
/* Use this function to set the directory containing installed pixmaps. */
void add_pixmap_directory (const gchar *directory);
/*
* Private Functions.
*/
/* This is used to create the pixmaps used in the interface. */
GtkWidget* create_pixmap (GtkWidget *widget,
const gchar *filename);
/* This is used to create the pixbufs used in the interface. */
GdkPixbuf* create_pixbuf (const gchar *filename);
/* This is used to set ATK action descriptions. */
void glade_set_atk_action_description (AtkAction *action,
const gchar *action_name,
const gchar *description);
modules/misc/Modules.am
View file @ 58ca65ac
...@@ -8,10 +8,6 @@ if BUILD_LUA ...@@ -8,10 +8,6 @@ if BUILD_LUA
SUBDIRS += lua SUBDIRS += lua
endif endif
SOURCES_gtk_main = gtk_main.c
SOURCES_gnome_main = gtk_main.c
SOURCES_gtk2_main = gtk_main.c
SOURCES_gnome2_main = gtk_main.c
SOURCES_screensaver = screensaver.c SOURCES_screensaver = screensaver.c
SOURCES_qte_main = qte_main.cpp SOURCES_qte_main = qte_main.cpp
SOURCES_freetype = freetype.c text_renderer.h SOURCES_freetype = freetype.c text_renderer.h
......
modules/misc/gtk_main.c deleted 100644 → 0
View file @ e9825663
/*****************************************************************************
* gtk_main.c : Gtk+ wrapper for gtk_main
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <gtk/gtk.h>
#if defined(MODULE_NAME_IS_gtk2_main)
# include <glib.h>
#endif
#if defined(MODULE_NAME_IS_gnome_main) || defined(MODULE_NAME_IS_gnome2_main)
# include <gnome.h>
#endif
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static void* GtkMain ( vlc_object_t * );
/*****************************************************************************
* Local variables (mutex-protected).
*****************************************************************************/
static int i_refcount = 0;
static vlc_object_t * p_gtk_main = NULL;
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin ()
int i_cap;
set_description( N_("Gtk+ GUI helper") )
#if defined(MODULE_NAME_IS_gtk_main)
i_cap = 90;
add_shortcut( "gtk" )
#elif defined(MODULE_NAME_IS_gnome_main)
i_cap = 100;
add_shortcut( "gtk" )
add_shortcut( "gnome" )
#elif defined(MODULE_NAME_IS_gtk2_main)
i_cap = 95;
add_shortcut( "gtk2" )
#elif defined(MODULE_NAME_IS_gnome2_main)
i_cap = 105;
add_shortcut( "gtk2" )
add_shortcut( "gnome2" )
#endif
set_capability( "gui-helper", i_cap )
set_callbacks( Open, Close )
linked_with_a_crap_library_which_uses_atexit ()
vlc_module_end ()
static vlc_mutex_t gtk_lock = VLC_STATIC_MUTEX;
/*****************************************************************************
* Open: initialize and create window
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
vlc_mutex_lock( &gtk_lock );
if( i_refcount > 0 )
{
i_refcount++;
vlc_mutex_unlock( &gtk_lock );
return VLC_SUCCESS;
}
p_gtk_main = vlc_object_create( p_this, sizeof( vlc_object_t ) );
/* Only initialize gthreads if it's the first time we do it */
if( !g_thread_supported() )
{
g_thread_init( NULL );
}
/* Launch the gtk_main() thread. It will not return until it has
* called gdk_threads_enter(), which ensures us thread safety. */
if( vlc_thread_create( p_gtk_main, "gtk_main", GtkMain,
VLC_THREAD_PRIORITY_LOW ) )
{
vlc_object_release( p_gtk_main );
i_refcount--;
vlc_mutex_unlock( &gtk_lock );
return VLC_ENOMEM;
}
i_refcount++;
vlc_mutex_unlock( &gtk_lock );
return VLC_SUCCESS;
}
/*****************************************************************************
* Close: destroy interface window
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
vlc_mutex_lock( &gtk_lock );
i_refcount--;
if( --i_refcount == 0 )
{
gtk_main_quit();
vlc_thread_join( p_gtk_main );
vlc_object_release( p_gtk_main );
p_gtk_main = NULL;
}
vlc_mutex_unlock( &gtk_lock );
}
static gint foo( gpointer bar ) { return TRUE; }
/*****************************************************************************
* GtkMain: Gtk+ thread
*****************************************************************************
* this part of the interface is in a separate thread so that we can call
* gtk_main() from within it without annoying the rest of the program.
*****************************************************************************/
static void* GtkMain( vlc_object_t *p_this )
{
/* gtk_init needs to know the command line. We don't care, so we
* give it an empty one */
static char *p_args[] = { "", NULL };
#if defined(MODULE_NAME_IS_gtk_main) || defined(MODULE_NAME_IS_gtk2_main)
static char **pp_args = p_args;
#endif
static int i_args = 1;
int canc = vlc_savecancel ();
/* FIXME: deprecated ? */
#if defined(MODULE_NAME_IS_gtk2_main) || defined(MODULE_NAME_IS_gnome2_main)
gdk_threads_init();
#endif
#if defined(MODULE_NAME_IS_gnome_main)
gnome_init( PACKAGE, VERSION, i_args, p_args );
#elif defined(MODULE_NAME_IS_gnome2_main)
gnome_program_init( PACKAGE, VERSION, LIBGNOMEUI_MODULE,
i_args, p_args,
GNOME_PARAM_APP_DATADIR, "",//PACKAGE_DATA_DIR,
NULL );
#else
gtk_set_locale();
gtk_init( &i_args, &pp_args );
#endif
gdk_threads_enter();
vlc_thread_ready( p_this );
/* If we don't add this simple timeout, gtk_main remains stuck if
* we try to close the window without having sent any gtk event. */
gtk_timeout_add( INTF_IDLE_SLEEP / 1000, foo, p_this );
/* Enter Gtk mode */
gtk_main();
gdk_threads_leave();
vlc_restorecancel (canc);
return NULL;
}
po/POTFILES.in
View file @ 58ca65ac
...@@ -642,14 +642,6 @@ modules/gui/minimal_macosx/voutagl.m ...@@ -642,14 +642,6 @@ modules/gui/minimal_macosx/voutagl.m
modules/gui/minimal_macosx/voutgl.h modules/gui/minimal_macosx/voutgl.h
modules/gui/minimal_macosx/voutgl.m modules/gui/minimal_macosx/voutgl.m
modules/gui/ncurses.c modules/gui/ncurses.c
modules/gui/pda/pda.c
modules/gui/pda/pda.h
modules/gui/pda/pda_callbacks.c
modules/gui/pda/pda_callbacks.h
modules/gui/pda/pda_interface.c
modules/gui/pda/pda_interface.h
modules/gui/pda/pda_support.c
modules/gui/pda/pda_support.h
modules/gui/qnx/aout.c modules/gui/qnx/aout.c
modules/gui/qnx/qnx.c modules/gui/qnx/qnx.c
modules/gui/qnx/vout.c modules/gui/qnx/vout.c
...@@ -1017,7 +1009,6 @@ modules/misc/dummy/renderer.c ...@@ -1017,7 +1009,6 @@ modules/misc/dummy/renderer.c
modules/misc/dummy/vout.c modules/misc/dummy/vout.c
modules/misc/freetype.c modules/misc/freetype.c
modules/misc/gnutls.c modules/misc/gnutls.c
modules/misc/gtk_main.c
modules/misc/inhibit.c modules/misc/inhibit.c
modules/misc/logger.c modules/misc/logger.c
modules/misc/lua/demux.c modules/misc/lua/demux.c
......
share/Makefile.am
View file @ 58ca65ac
...@@ -17,7 +17,6 @@ nobase_dist_vlcdata_SCRIPTS = \ ...@@ -17,7 +17,6 @@ nobase_dist_vlcdata_SCRIPTS = \
EXTRA_DIST = \ EXTRA_DIST = \
$(skins2_default_vlt_FILES) \ $(skins2_default_vlt_FILES) \
$(DIST_rsrc) \ $(DIST_rsrc) \
$(DIST_pda) \
$(DIST_skins2) \ $(DIST_skins2) \
$(DIST_http) \ $(DIST_http) \
$(DIST_http_lua) \ $(DIST_http_lua) \
...@@ -31,9 +30,6 @@ if BUILD_SKINS ...@@ -31,9 +30,6 @@ if BUILD_SKINS
nobase_vlcdata_DATA += skins2/default.vlt nobase_vlcdata_DATA += skins2/default.vlt
nobase_vlcdata_DATA += $(DIST_skins2) nobase_vlcdata_DATA += $(DIST_skins2)
endif endif
if BUILD_PDA
nobase_vlcdata_DATA += $(DIST_pda)
endif
if BUILD_HTTPD if BUILD_HTTPD
nobase_vlcdata_DATA += $(DIST_http) nobase_vlcdata_DATA += $(DIST_http)
endif endif
...@@ -63,16 +59,6 @@ DIST_rsrc = \ ...@@ -63,16 +59,6 @@ DIST_rsrc = \
vlc_win32_rc.rc.in \ vlc_win32_rc.rc.in \
libvlc_win32_rc.rc.in libvlc_win32_rc.rc.in
DIST_pda = \
pda-forwardb16x16.xpm \
pda-openb16x16.xpm \
pda-pauseb16x16.xpm \
pda-playb16x16.xpm \
pda-playlistb16x16.xpm \
pda-preferencesb16x16.xpm \
pda-rewindb16x16.xpm \
pda-stopb16x16.xpm
DIST_icons = vlc.ico DIST_icons = vlc.ico
DIST_icons16 = vlc16x16.png vlc16x16.xpm DIST_icons16 = vlc16x16.png vlc16x16.xpm
......
share/pda-forwardb16x16.xpm deleted 100644 → 0
View file @ e9825663
/* XPM */
static const char *const familiar_forwardb16x16_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
" ",
" ",
" .. ... ",
" ... ... ",
" .... ... ",
" ..... ... ",
" ......... ",
" ......... ",
" ......... ",
" ..... ... ",
" .... ... ",
" ... ... ",
" .. ... ",
" ",
" ",
" "};
share/pda-openb16x16.xpm deleted 100644 → 0
View file @ e9825663
/* XPM */
static const char *const familiar_openb16x16_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
" ",
" ",
" .. ",
" .... ",
" ...... ",
" ........ ",
" .......... ",
" ............ ",
" ............ ",
" ",
" ............ ",
" ............ ",
" ............ ",
" ............ ",
" ",
" "};
share/pda-pauseb16x16.xpm deleted 100644 → 0
View file @ e9825663
/* XPM */
static const char *const familiar_pauseb16x16_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
" ",
" ",
" .... .... ",
" .... .... ",
" .... .... ",
" .... .... ",
" .... .... ",
" .... .... ",
" .... .... ",
" .... .... ",
" .... .... ",
" .... .... ",
" .... .... ",
" .... .... ",
" ",
" "};
share/pda-playb16x16.xpm deleted 100644 → 0
View file @ e9825663
/* XPM */
static const char *const familiar_playb16x16_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
" ",
" ",
" .. ",
" .... ",
" ...... ",
" ........ ",
" .......... ",
" ........... ",
" ........... ",
" .......... ",
" ........ ",
" ...... ",
" .... ",
" .. ",
" ",
" "};
share/pda-playlistb16x16.xpm deleted 100644 → 0
View file @ e9825663
/* XPM */
static const char *const familiar_playlistb16x16_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
" ",
" ............ ",
" ............ ",
" .. .. ",
" .. .. ",
" ............ ",
" ............ ",
" .. .. ",
" .. .. ",
" ............ ",
" ............ ",
" .. .. ",
" .. .. ",
" ............ ",
" ............ ",
" "};
share/pda-preferencesb16x16.xpm deleted 100644 → 0
View file @ e9825663
/* XPM */
static const char *const familiar_preferencesb16x16_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
" ",
" ",
" ....... ",
" ......... ",
" ........... ",
" ..... ..... ",
" ..... ..... ",
" ..... ..... ",
" ..... ..... ",
" ..... ..... ",
" ..... ..... ",
" ..... ..... ",
" ........... ",
" ......... ",
" ....... ",
" "};
share/pda-rewindb16x16.xpm deleted 100644 → 0
View file @ e9825663
/* XPM */
static const char *const familiar_rewindb16x16_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
" ",
" ",
" ... .. ",
" ... ... ",
" ... .... ",
" ... ..... ",
" ......... ",
" ......... ",
" ......... ",
" ... ..... ",
" ... .... ",
" ... ... ",
" ... .. ",
" ",
" ",
" "};
share/pda-stopb16x16.xpm deleted 100644 → 0
View file @ e9825663
/* XPM */
static const char *const familiar_stopb16x16_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
" ",
" ",
" ",
" ........ ",
" ........ ",
" ........ ",
" ........ ",
" ........ ",
" ........ ",
" ........ ",
" ........ ",
" ........ ",
" ........ ",
" ",
" ",
" "};
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