Skip to content

V
vlc
Commit 03062ad3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Hildon UI: remove dead technology 

That plugin was written for Maemo 4. It barely worked with Maemo 5.
Maemo 6 did not have Hildon. Hildon is unmaintained and unused.
parent 23247a85
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2089 deletions
Makefile.am
View file @ 03062ad3
...@@ -568,7 +568,7 @@ doc: ...@@ -568,7 +568,7 @@ doc:
# Building aliases # Building aliases
############################################################################### ###############################################################################
ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc ALL_ALIASES = cvlc rvlc svlc qvlc nvlc
bin_SCRIPTS = $(ALIASES) bin_SCRIPTS = $(ALIASES)
CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
EXTRA_SCRIPTS = $(ALL_ALIASES) EXTRA_SCRIPTS = $(ALL_ALIASES)
...@@ -592,9 +592,6 @@ qvlc: make-alias Makefile ...@@ -592,9 +592,6 @@ qvlc: make-alias Makefile
nvlc: make-alias Makefile nvlc: make-alias Makefile
$(AM_V_GEN)$(MKALIAS) ncurses $(AM_V_GEN)$(MKALIAS) ncurses
mvlc: make-alias Makefile
$(AM_V_GEN)$(MKALIAS) maemo
if BUILD_VLC if BUILD_VLC
noinst_SCRIPTS = vlc$(EXEEXT) noinst_SCRIPTS = vlc$(EXEEXT)
endif endif
......
NEWS
View file @ 03062ad3
...@@ -66,6 +66,7 @@ Removed modules: ...@@ -66,6 +66,7 @@ Removed modules:
* Linux Framebuffer On Screen Display interface (fbosd) * Linux Framebuffer On Screen Display interface (fbosd)
* RTMP access: use libavformat avio instead * RTMP access: use libavformat avio instead
* RTMP access_output: use libavformat avio instead * RTMP access_output: use libavformat avio instead
* Hildon GUI
Changes between 2.0.2 and 2.0.3: Changes between 2.0.2 and 2.0.3:
......
configure.ac
View file @ 03062ad3
...@@ -3551,32 +3551,6 @@ dnl ...@@ -3551,32 +3551,6 @@ dnl
EXTEND_HELP_STRING([Interface plugins:]) EXTEND_HELP_STRING([Interface plugins:])
dnl
dnl Hildon UI
dnl
AC_ARG_ENABLE(hildon,
[ --enable-hildon Hildon touchscreen UI (default disabled)])
AS_IF([test "${enable_hildon}" = "yes"], [
PKG_CHECK_MODULES(HILDON, [hildon-1], [
PKG_CHECK_MODULES(HILDON_FM, hildon-fm-2, [
VLC_ADD_CFLAGS([hildon],[${HILDON_FM_CFLAGS} -DHAVE_HILDON_FM])
VLC_ADD_LIBS([hildon],[${HILDON_FM_LIBS}])
], [
AC_MSG_WARN([${HILDON_FM_PKG_ERRORS}.])
])
VLC_ADD_CFLAGS([hildon],[${HILDON_CFLAGS} ${X_CFLAGS}])
VLC_ADD_LIBS([hildon],[${HILDON_LIBS} ${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_PLUGIN([hildon])
ALIASES="${ALIASES} mvlc"
], [
AS_IF([test "${enable_hildon}" = "yes"],[
AC_MSG_ERROR([${HILDON_PKG_ERRORS}.])
])
enable_hildon="no"
])
])
AM_CONDITIONAL(BUILD_HILDON, [test "${enable_hildon}" = "yes"])
dnl dnl
dnl QT dnl QT
dnl dnl
...@@ -4190,7 +4164,6 @@ AC_CONFIG_FILES([ ...@@ -4190,7 +4164,6 @@ AC_CONFIG_FILES([
modules/demux/playlist/Makefile modules/demux/playlist/Makefile
modules/gui/Makefile modules/gui/Makefile
modules/gui/macosx/Makefile modules/gui/macosx/Makefile
modules/gui/hildon/Makefile
modules/gui/minimal_macosx/Makefile modules/gui/minimal_macosx/Makefile
modules/gui/macosx_dialog_provider/Makefile modules/gui/macosx_dialog_provider/Makefile
modules/gui/qt4/Makefile modules/gui/qt4/Makefile
......
modules/LIST
View file @ 03062ad3
...@@ -143,7 +143,6 @@ $Id$ ...@@ -143,7 +143,6 @@ $Id$
* growl: announce currently playing stream to growl * growl: announce currently playing stream to growl
* h264: H264 decoder * h264: H264 decoder
* headphone_channel_mixer: headphone channel mixer with virtual spatialization effect * headphone_channel_mixer: headphone channel mixer with virtual spatialization effect
* hildon: Maemo interface based on Hildon
* hotkeys: hotkeys control module * hotkeys: hotkeys control module
* hqdn3d: High Quality denoising filter * hqdn3d: High Quality denoising filter
* htcpcp: HTCPCP access module * htcpcp: HTCPCP access module
......
modules/gui/Modules.am
View file @ 03062ad3
DIST_SUBDIRS = macosx hildon minimal_macosx qt4 skins2 macosx_dialog_provider DIST_SUBDIRS = macosx minimal_macosx qt4 skins2 macosx_dialog_provider
SUBDIRS = SUBDIRS =
if HAVE_DARWIN if HAVE_DARWIN
SUBDIRS += macosx macosx_dialog_provider SUBDIRS += macosx macosx_dialog_provider
endif endif
if BUILD_HILDON
SUBDIRS += hildon
endif
if ENABLE_QT4 if ENABLE_QT4
SUBDIRS += qt4 SUBDIRS += qt4
endif endif
......
modules/gui/hildon/Modules.am deleted 100644 → 0
View file @ 23247a85
SOURCES_hildon = maemo.c \
maemo.h \
maemo_callbacks.c \
maemo_callbacks.h \
maemo_input.c \
maemo_input.h \
maemo_interface.c \
maemo_interface.h \
maemo_menus.c
modules/gui/hildon/maemo.c deleted 100644 → 0
View file @ 23247a85
This diff is collapsed.
modules/gui/hildon/maemo.h deleted 100644 → 0
View file @ 23247a85
/*****************************************************************************
* maemo.h: private Maemo Interface Description
*****************************************************************************
* Copyright (C) 2008 the VideoLAN team
* $Id$
*
* Authors: Antoine Lejeune <phytos@videolan.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.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <hildon/hildon-program.h>
#include <hildon/hildon-seekbar.h>
#include <hildon/hildon-banner.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_input.h>
#include <vlc_vout.h>
struct intf_sys_t
{
vlc_thread_t thread;
playlist_t *p_playlist;
input_thread_t *p_input;
vlc_sem_t ready;
HildonWindow *p_main_window;
HildonSeekbar *p_seekbar;
GtkWidget *p_play_button;
GtkListStore *p_playlist_store;
GtkWidget *p_playlist_window;
int i_event;
vlc_spinlock_t event_lock;
GtkWidget *p_video_window;
uint32_t xid; /* X11 windows ID */
bool b_fullscreen;
GtkWidget *p_control_window;
GtkMenuItem *menu_input;
GtkMenuItem *menu_audio;
GtkMenuItem *menu_video;
};
GtkWidget *create_menu( intf_thread_t *p_intf );
modules/gui/hildon/maemo_callbacks.c deleted 100644 → 0
View file @ 23247a85
This diff is collapsed.
modules/gui/hildon/maemo_callbacks.h deleted 100644 → 0
View file @ 23247a85
/*****************************************************************************
* maemo_callbacks.h : Callbacks header file for the maemo plugin.
*****************************************************************************
* Copyright (C) 2008 the VideoLAN team
* $Id$
*
* Authors: Antoine Lejeune <phytos@videolan.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 play_cb( GtkButton *button, gpointer user_data );
void stop_cb( GtkButton *button, gpointer user_data );
void prev_cb( GtkButton *button, gpointer user_data );
void next_cb( GtkButton *button, gpointer user_data );
void playlist_cb( GtkButton *button, gpointer user_data );
void seekbar_changed_cb( GtkRange *range, GtkScrollType scroll,
gdouble value, gpointer data );
void pl_row_activated_cb( GtkTreeView *, GtkTreePath *, GtkTreeViewColumn *,
gpointer );
void open_cb( GtkMenuItem *menuitem, gpointer user_data );
void open_address_cb( GtkMenuItem *menuitem, gpointer user_data );
void open_webcam_cb( GtkMenuItem *menuitem, gpointer user_data );
void snapshot_cb( GtkMenuItem *menuitem, gpointer user_data );
void dropframe_cb( GtkMenuItem *menuitem, gpointer user_data );
gboolean key_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data);
gboolean fullscreen_cb(gpointer user_data);
modules/gui/hildon/maemo_input.c deleted 100644 → 0
View file @ 23247a85
/*****************************************************************************
* maemo_input.c : Input handling for the maemo plugin
*****************************************************************************
* Copyright (C) 2008 the VideoLAN team
* $Id$
*
* Authors: Antoine Lejeune <phytos@videolan.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.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include "maemo.h"
#include "maemo_input.h"
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
static void update_position( intf_thread_t *p_intf );
static void item_changed( intf_thread_t *p_intf );
static void item_changed_pl( intf_thread_t *p_intf );
static int input_event_cb( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param );
static int interface_changed_cb( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval,
void *param );
static gboolean process_events( gpointer data );
void set_input( intf_thread_t *p_intf, input_thread_t *p_input );
void delete_input( intf_thread_t *p_intf );
/*****************************************************************************
* Functions.
*****************************************************************************/
void post_event( intf_thread_t *p_intf, int i_event )
{
vlc_spin_lock( &p_intf->p_sys->event_lock );
p_intf->p_sys->i_event |= i_event;
vlc_spin_unlock( &p_intf->p_sys->event_lock );
g_idle_add( process_events, p_intf );
}
static gboolean process_events( gpointer data )
{
intf_thread_t *p_intf = (intf_thread_t *)data;
int i_event;
vlc_spin_lock( &p_intf->p_sys->event_lock );
i_event = p_intf->p_sys->i_event;
p_intf->p_sys->i_event = 0;
vlc_spin_unlock( &p_intf->p_sys->event_lock );
if( !i_event ) return TRUE;
if( i_event & EVENT_PLAYLIST_CURRENT )
item_changed_pl( p_intf );
if( i_event & EVENT_ACTIVITY )
item_changed_pl( p_intf );
if( i_event & EVENT_ITEM_CHANGED )
item_changed( p_intf );
if( i_event & EVENT_INTF_CHANGED )
update_position( p_intf );
return FALSE;
}
void set_input( intf_thread_t *p_intf, input_thread_t *p_input )
{
if( p_input && !( p_input->b_die || p_input->b_dead ) )
{
p_intf->p_sys->p_input = p_input;
vlc_object_hold( p_input );
var_AddCallback( p_input, "intf-event", input_event_cb, p_intf );
// "Activate" the seekbar
gtk_widget_set_sensitive( GTK_WIDGET( p_intf->p_sys->p_seekbar ), TRUE );
}
else
p_intf->p_sys->p_input = NULL;
}
void delete_input( intf_thread_t *p_intf )
{
if( p_intf->p_sys->p_input )
{
var_DelCallback( p_intf->p_sys->p_input, "intf-event",
input_event_cb, p_intf );
vlc_object_release( p_intf->p_sys->p_input );
p_intf->p_sys->p_input = NULL;
// Reset the seekbar
hildon_seekbar_set_position( p_intf->p_sys->p_seekbar, 0 );
gtk_widget_set_sensitive( GTK_WIDGET( p_intf->p_sys->p_seekbar ), FALSE );
}
}
static void item_changed_pl( intf_thread_t *p_intf )
{
if( p_intf->p_sys->p_input &&
( p_intf->p_sys->p_input->b_dead || p_intf->p_sys->p_input->b_die ) )
{
delete_input( p_intf );
return;
}
if( !p_intf->p_sys->p_input )
{
set_input( p_intf, playlist_CurrentInput( p_intf->p_sys->p_playlist ) );
}
return;
}
int playlist_current_cb( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
intf_thread_t *p_intf = (intf_thread_t *)param;
(void)p_this; (void)psz_var; (void)oldval; (void)newval;
vlc_spin_lock( &p_intf->p_sys->event_lock );
p_intf->p_sys->i_event |= EVENT_PLAYLIST_CURRENT;
vlc_spin_unlock( &p_intf->p_sys->event_lock );
g_idle_add( process_events, p_intf );
return VLC_SUCCESS;
}
int activity_cb( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
intf_thread_t *p_intf = (intf_thread_t *)param;
(void)p_this; (void)psz_var; (void)oldval; (void)newval;
vlc_spin_lock( &p_intf->p_sys->event_lock );
p_intf->p_sys->i_event |= EVENT_ACTIVITY;
vlc_spin_unlock( &p_intf->p_sys->event_lock );
g_idle_add( process_events, p_intf );
return VLC_SUCCESS;
}
static void item_changed( intf_thread_t *p_intf )
{
GtkButton *p_button = GTK_BUTTON( p_intf->p_sys->p_play_button );
vlc_value_t state;
if( !p_intf->p_sys->p_input )
return;
var_Get( p_intf->p_sys->p_input, "state", &state );
// We change the "play" button
if( state.i_int == PLAYING_S )
gtk_button_set_image( p_button, gtk_image_new_from_stock( "vlc-pause",
GTK_ICON_SIZE_BUTTON ) );
else
gtk_button_set_image( p_button, gtk_image_new_from_stock( "vlc-play",
GTK_ICON_SIZE_BUTTON ) );
}
int item_changed_cb( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
(void)p_this; (void)psz_var; (void)oldval; (void)newval;
intf_thread_t *p_intf = (intf_thread_t *)param;
vlc_spin_lock( &p_intf->p_sys->event_lock );
p_intf->p_sys->i_event |= EVENT_ITEM_CHANGED;
vlc_spin_unlock( &p_intf->p_sys->event_lock );
g_idle_add( process_events, p_intf );
return VLC_SUCCESS;
}
static void update_position( intf_thread_t *p_intf )
{
if( p_intf->p_sys->p_input )
{
hildon_seekbar_set_total_time( p_intf->p_sys->p_seekbar,
var_GetTime( p_intf->p_sys->p_input, "length" )/1000000 );
hildon_seekbar_set_position( p_intf->p_sys->p_seekbar,
var_GetTime( p_intf->p_sys->p_input, "time" )/1000000 );
}
}
static int interface_changed_cb( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval,
void *param )
{
intf_thread_t *p_intf = (intf_thread_t *)param;
(void)p_this; (void)psz_var; (void)oldval; (void)newval;
vlc_spin_lock( &p_intf->p_sys->event_lock );
p_intf->p_sys->i_event |= EVENT_INTF_CHANGED;
vlc_spin_unlock( &p_intf->p_sys->event_lock );
g_idle_add( process_events, p_intf );
return VLC_SUCCESS;
}
static int input_event_cb( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
if( newval.i_int == INPUT_EVENT_STATE )
return item_changed_cb( p_this, psz_var, oldval, newval, param );
else
return interface_changed_cb( p_this, psz_var, oldval, newval, param );
}
modules/gui/hildon/maemo_input.h deleted 100644 → 0
View file @ 23247a85
/*****************************************************************************
* maemo_input.h : Input handling header file for the maemo plugin.
*****************************************************************************
* Copyright (C) 2008 the VideoLAN team
* $Id$
*
* Authors: Antoine Lejeune <phytos@videolan.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>
#define EVENT_ITEM_STATE_CHANGE (1<<0)
#define EVENT_PLAYLIST_CURRENT (1<<1)
#define EVENT_ACTIVITY (1<<2)
#define EVENT_ITEM_CHANGED (1<<3)
#define EVENT_INTF_CHANGED (1<<4)
void post_event( intf_thread_t *p_intf, int event );
void set_input( intf_thread_t *p_intf, input_thread_t *p_input );
void delete_input( intf_thread_t *p_intf );
int playlist_current_cb( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param );
int activity_cb( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param );
int item_changed_cb( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param );
modules/gui/hildon/maemo_interface.c deleted 100644 → 0
View file @ 23247a85
/*****************************************************************************
* maemo_interface.c : Interface creation of the maemo plugin
*****************************************************************************
* Copyright (C) 2008 the VideoLAN team
* $Id$
*
* Authors: Antoine Lejeune <phytos@videolan.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 <vlc_common.h>
#include <gtk/gtk.h>
#include "maemo.h"
#include "maemo_callbacks.h"
#include "maemo_interface.h"
#include "maemo_input.h"
static void scan_maemo_for_media ( intf_thread_t *p_intf );
static void find_media_in_dir ( const char *psz_dir, GList **pp_list );
static const char *ppsz_extensions[] =
{ "aac", "flac", "m4a", "m4p", "mka", "mp1", "mp2", "mp3",
"ogg", "wav", "wma", "asf", "avi", "divx", "flv", "m1v",
"m2v", "m4v", "mkv", "mov", "mpeg", "mpeg1", "mpeg2", "mpeg4",
"mpg", "ogm", "wmv", NULL };
static const char *ppsz_media_dirs[] =
{ "/media/mmc1", "/media/mmc2", "/home/user/MyDocs/.videos", NULL };
void create_playlist( intf_thread_t *p_intf )
{
GtkWidget *playlist;
GtkWidget *scroll;
GtkListStore *playlist_store;
GtkTreeViewColumn *col;
GtkCellRenderer *renderer;
playlist = gtk_tree_view_new();
playlist_store = gtk_list_store_new( 1, G_TYPE_STRING );
p_intf->p_sys->p_playlist_store = playlist_store;
gtk_tree_view_set_model( GTK_TREE_VIEW( playlist ),
GTK_TREE_MODEL( playlist_store ) );
renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new_with_attributes( "File", renderer,
"text", 0, NULL );
gtk_tree_view_append_column( GTK_TREE_VIEW( playlist ), col );
g_object_set( playlist, "headers-visible", TRUE, NULL );
scan_maemo_for_media( p_intf );
scroll = gtk_scrolled_window_new( NULL, NULL );
gtk_container_add( GTK_CONTAINER( scroll ), playlist );
p_intf->p_sys->p_playlist_window = scroll;
g_signal_connect( playlist, "row-activated",
G_CALLBACK( pl_row_activated_cb ), NULL );
// Set callback with the vlc core
var_AddCallback( p_intf->p_sys->p_playlist, "item-change",
item_changed_cb, p_intf );
var_AddCallback( p_intf->p_sys->p_playlist, "item-current",
playlist_current_cb, p_intf );
var_AddCallback( p_intf->p_sys->p_playlist, "activity",
activity_cb, p_intf );
}
void delete_playlist( intf_thread_t *p_intf )
{
var_DelCallback( p_intf->p_sys->p_playlist, "item-change",
item_changed_cb, p_intf );
var_DelCallback( p_intf->p_sys->p_playlist, "item-current",
playlist_current_cb, p_intf );
var_DelCallback( p_intf->p_sys->p_playlist, "activity",
activity_cb, p_intf );
}
static void scan_maemo_for_media( intf_thread_t *p_intf )
{
GtkListStore *playlist_store = GTK_LIST_STORE( p_intf->p_sys->p_playlist_store );
GList *list = NULL;
GtkTreeIter iter;
for( int i = 0; ppsz_media_dirs[i]; i++ )
{
find_media_in_dir( ppsz_media_dirs[i], &list );
msg_Dbg( p_intf, "Looking for media in %s", ppsz_media_dirs[i] );
}
list = g_list_first( list );
while( list )
{
msg_Dbg( p_intf, "Adding : %s", (char *)list->data );
gtk_list_store_append( playlist_store, &iter );
gtk_list_store_set( playlist_store, &iter,
0, list->data, -1 );
list = g_list_next( list );
}
}
static void find_media_in_dir( const char *psz_dir, GList **pp_list )
{
GDir *dir = NULL;
const gchar *psz_name;
char *psz_path;
dir = g_dir_open( psz_dir, 0, NULL );
if( !dir )
return;
while( ( psz_name = g_dir_read_name( dir ) ) != NULL )
{
psz_path = g_build_path( "/", psz_dir, psz_name, NULL );
if( g_file_test( psz_path, G_FILE_TEST_IS_DIR ) &&
!g_file_test( psz_path, G_FILE_TEST_IS_SYMLINK ) )
find_media_in_dir( psz_path, pp_list );
else
{
char *psz_ext = strrchr( psz_name, '.' );
if( psz_ext )
{
psz_ext++;
for( int i = 0; ppsz_extensions[i]; i++ )
{
if( strcmp( psz_ext, ppsz_extensions[i] ) == 0 )
{
*pp_list = g_list_append( *pp_list, g_strdup( psz_path ) );
break;
}
}
}
}
g_free( psz_path );
}
g_dir_close( dir );
return;
}
modules/gui/hildon/maemo_interface.h deleted 100644 → 0
View file @ 23247a85
/*****************************************************************************
* maemo_interface.h : Interface creation header file for the maemo plugin.
*****************************************************************************
* Copyright (C) 2008 the VideoLAN team
* $Id$
*
* Authors: Antoine Lejeune <phytos@videolan.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>
void create_playlist( intf_thread_t *p_intf );
void delete_playlist( intf_thread_t *p_intf );
modules/gui/hildon/maemo_menus.c deleted 100644 → 0
View file @ 23247a85
This diff is collapsed.
po/POTFILES.in
View file @ 03062ad3
...@@ -505,7 +505,6 @@ modules/demux/vobsub.c ...@@ -505,7 +505,6 @@ modules/demux/vobsub.c
modules/demux/voc.c modules/demux/voc.c
modules/demux/wav.c modules/demux/wav.c
modules/demux/xa.c modules/demux/xa.c
modules/gui/hildon/maemo.c
modules/gui/macosx/about.h modules/gui/macosx/about.h
modules/gui/macosx/about.m modules/gui/macosx/about.m
modules/gui/macosx/AppleRemote.h modules/gui/macosx/AppleRemote.h
......
share/Makefile.am
View file @ 03062ad3
...@@ -50,7 +50,6 @@ EXTRA_DIST += \ ...@@ -50,7 +50,6 @@ EXTRA_DIST += \
$(DIST_lua) \ $(DIST_lua) \
osdmenu/default.cfg.in \ osdmenu/default.cfg.in \
$(DIST_osdmenu_default) \ $(DIST_osdmenu_default) \
$(DIST_maemo) \
$(DIST_solid) $(DIST_solid)
CLEANFILES += osdmenu/default.cfg CLEANFILES += osdmenu/default.cfg
...@@ -64,9 +63,6 @@ nobase_vlcdata_DATA += \ ...@@ -64,9 +63,6 @@ nobase_vlcdata_DATA += \
osdmenu/default.cfg \ osdmenu/default.cfg \
$(DIST_osdmenu_default) $(DIST_osdmenu_default)
endif endif
if BUILD_HILDON
nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
endif
if KDE_SOLID if KDE_SOLID
soliddata_DATA = $(DIST_solid) soliddata_DATA = $(DIST_solid)
endif endif
...@@ -388,20 +384,6 @@ DIST_http_lua = \ ...@@ -388,20 +384,6 @@ DIST_http_lua = \
lua/http/js/jquery-ui-1.8.13.custom.min.js \ lua/http/js/jquery-ui-1.8.13.custom.min.js \
lua/http/old/style.css lua/http/old/style.css
DIST_maemo = \
maemo/vlc_intf.rc \
maemo/vlc_left_tab_active.png \
maemo/vlc_left_tab_passive.png \
maemo/playlist.png \
maemo/play.png \
maemo/pause.png \
maemo/stop.png \
maemo/previous.png \
maemo/next.png
maemo_FILES = \
icons/32x32/vlc.png
DIST_solid = \ DIST_solid = \
solid/vlc-opencda.desktop \ solid/vlc-opencda.desktop \
solid/vlc-opendvd.desktop \ solid/vlc-opendvd.desktop \
......
share/maemo/vlc_intf.rc deleted 100644 → 0
View file @ 23247a85
style "videolan-notebook"
{
GtkNotebook::inner_left_border = 0
GtkNotebook::inner_right_border = 0
GtkNotebook::tab-overlap = 0
GtkNotebook::arrow-spacing = 6
GtkNotebook::label-padding = 12
GtkWidget::scroll-arrow-hlength = 20
GtkWidget::scroll-arrow-vlength = 30
engine "sapwood"
{
image
{
function = EXTENSION
state = ACTIVE
file = "vlc_left_tab_passive.png"
border = { 12, 12, 12, 12 }
gap_side = RIGHT
}
image
{
function = EXTENSION
file = "vlc_left_tab_active.png"
border = { 12, 12, 12, 12 }
gap_side = RIGHT
}
}
}
class "GtkNotebook" style "videolan-notebook"
style "videolan"
{
stock["vlc-next"] = {{ "next.png" }}
stock["vlc-previous"] = {{ "previous.png" }}
stock["vlc-stop"] = {{ "stop.png" }}
stock["vlc-play"] = {{ "play.png" }}
stock["vlc-pause"] = {{ "pause.png" }}
stock["vlc-playlist"] = {{ "playlist.png" }}
stock["vlc"] = {{ "../../icons/hicolor/32x32/apps/vlc.png" }}
}
widget "*" style "videolan"
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