Skip to content

V
vlc-1.1
Commit 586295b9 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* configure.ac.in: added an --enable-mostly-builtin option to avoid having too many plugins.
* modules/gui/skins/src/*: reverted the last BASIC_SKINS patch (BASIC_SKINS was not broken, the changes were done on purpose).
* modules/gui/skins/src/dialogs.[cpp,h]: ran dos2unix on these 2 files.
parent 1fe87c05
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 127 deletions
configure.ac.in
View file @ 586295b9
......@@ -821,6 +821,16 @@ PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys au"
PLUGINS="${PLUGINS} access_file access_udp access_http ipv4 access_mms"
PLUGINS="${PLUGINS} access_ftp access_directory sap httpd http"
dnl
dnl Switch to enable a version of VLC where most modules will be builtin
dnl
AC_ARG_ENABLE(mostly-builtin,
[ --enable-mostly-builtin most modules will be built-in (default disabled)])
if test "x${enable_mostly_builtin}" = "xyes"; then
BUILTINS="${BUILTINS} ${PLUGINS}"
PLUGINS=""
fi
dnl
dnl Some plugins aren't useful on some platforms
dnl
......@@ -1169,7 +1179,7 @@ dnl
dnl dvdplay module: check for libdvdplay
dnl
AC_ARG_ENABLE(dvdplay,
[ --enable-dvdplay dvdplay input module (default disabled)])
[ --enable-dvdplay dvdplay input module (default enabled)])
if test "x${enable_dvdplay}" != "xno"
then
AC_ARG_WITH(dvdplay,
......
modules/gui/skins/src/dialogs.cpp
View file @ 586295b9
......@@ -2,7 +2,7 @@
* dialogs.cpp: Handles all the different dialog boxes we provide.
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: dialogs.cpp,v 1.5 2003/06/09 12:33:16 asmax Exp $
* $Id: dialogs.cpp,v 1.6 2003/06/10 11:43:40 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -54,6 +54,7 @@ void Dialogs::ShowOpenSkin(){}
void Dialogs::ShowMessages(){}
void Dialogs::ShowPrefs(){}
void Dialogs::ShowFileInfo(){}
void Dialogs::ShowPopup(){}
#else // BASIC_SKINS
......
modules/gui/skins/src/dialogs.h
View file @ 586295b9
/*****************************************************************************
* dialogs.h: Dialogs class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: dialogs.h,v 1.4 2003/06/08 16:56:48 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111,
* USA.
*****************************************************************************/
#ifndef VLC_SKIN_DIALOGS
#define VLC_SKIN_DIALOGS
//--- GENERAL ---------------------------------------------------------------
#include <string>
using namespace std;
//---------------------------------------------------------------------------
struct intf_thread_t;
#ifndef BASIC_SKINS
#ifdef WIN32 /* mingw32 hack */
# undef Yield
# undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wx.h>
class OpenDialog;
class Messages;
class SoutDialog;
class PrefsDialog;
class FileInfo;
class wxIcon;
typedef struct dialogs_thread_t
{
VLC_COMMON_MEMBERS
intf_thread_t * p_intf;
} dialogs_thread_t;
#endif
//---------------------------------------------------------------------------
class Dialogs
{
protected:
intf_thread_t *p_intf;
public:
// Constructor
Dialogs( intf_thread_t *_p_intf );
// Destructor
virtual ~Dialogs();
void ShowOpen( bool b_play );
void ShowOpenSkin();
void ShowMessages();
void ShowPrefs();
void ShowFileInfo();
void ShowPopup();
vlc_bool_t b_popup_change;
#ifndef BASIC_SKINS
// Dialogs
OpenDialog *OpenDlg;
Messages *MessagesDlg;
PrefsDialog *PrefsDlg;
FileInfo *FileInfoDlg;
dialogs_thread_t *p_thread;
void OnShowOpen( wxCommandEvent& event );
void OnShowOpenSkin( wxCommandEvent& event );
void OnShowMessages( wxCommandEvent& event );
void OnShowPrefs( wxCommandEvent& event );
void OnShowFileInfo( wxCommandEvent& event );
void OnShowPopup( wxCommandEvent& event );
void OnExitThread( wxCommandEvent& event );
#endif
};
//---------------------------------------------------------------------------
#endif
/*****************************************************************************
* dialogs.h: Dialogs class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: dialogs.h,v 1.5 2003/06/10 11:43:40 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111,
* USA.
*****************************************************************************/
#ifndef VLC_SKIN_DIALOGS
#define VLC_SKIN_DIALOGS
//--- GENERAL ---------------------------------------------------------------
#include <string>
using namespace std;
//---------------------------------------------------------------------------
struct intf_thread_t;
#ifndef BASIC_SKINS
#ifdef WIN32 /* mingw32 hack */
# undef Yield
# undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wx.h>
class OpenDialog;
class Messages;
class SoutDialog;
class PrefsDialog;
class FileInfo;
class wxIcon;
typedef struct dialogs_thread_t
{
VLC_COMMON_MEMBERS
intf_thread_t * p_intf;
} dialogs_thread_t;
#endif
//---------------------------------------------------------------------------
class Dialogs
{
protected:
intf_thread_t *p_intf;
public:
// Constructor
Dialogs( intf_thread_t *_p_intf );
// Destructor
virtual ~Dialogs();
void ShowOpen( bool b_play );
void ShowOpenSkin();
void ShowMessages();
void ShowPrefs();
void ShowFileInfo();
void ShowPopup();
vlc_bool_t b_popup_change;
#ifndef BASIC_SKINS
// Dialogs
OpenDialog *OpenDlg;
Messages *MessagesDlg;
PrefsDialog *PrefsDlg;
FileInfo *FileInfoDlg;
dialogs_thread_t *p_thread;
void OnShowOpen( wxCommandEvent& event );
void OnShowOpenSkin( wxCommandEvent& event );
void OnShowMessages( wxCommandEvent& event );
void OnShowPrefs( wxCommandEvent& event );
void OnShowFileInfo( wxCommandEvent& event );
void OnShowPopup( wxCommandEvent& event );
void OnExitThread( wxCommandEvent& event );
#endif
};
//---------------------------------------------------------------------------
#endif
modules/gui/skins/src/skin_common.h
View file @ 586295b9
......@@ -2,7 +2,7 @@
* skin_common.h: Private Skin interface description
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: skin_common.h,v 1.18 2003/06/09 19:08:33 asmax Exp $
* $Id: skin_common.h,v 1.19 2003/06/10 11:43:40 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -72,12 +72,12 @@ struct intf_sys_t
int i_index; // Set which file is being played
int i_size; // Size of playlist;
#ifndef BASIC_SKINS
// Interface dialogs
Dialogs *p_dialogs;
// Popup menu
vlc_bool_t b_popup_change;
#ifndef BASIC_SKINS
wxMenu *p_popup_menu;
#endif
......
modules/gui/skins/src/vlcproc.cpp
View file @ 586295b9
......@@ -2,7 +2,7 @@
* vlcproc.cpp: VlcProc class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: vlcproc.cpp,v 1.33 2003/06/09 12:33:16 asmax Exp $
* $Id: vlcproc.cpp,v 1.34 2003/06/10 11:43:40 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -102,10 +102,8 @@ bool VlcProc::EventProc( Event *evt )
return true;
case VLC_OPEN:
#ifndef BASIC_SKINS
p_intf->p_sys->p_dialogs->ShowOpen( true );
InterfaceRefresh();
#endif
return true;
case VLC_LOAD_SKIN:
......@@ -137,31 +135,23 @@ bool VlcProc::EventProc( Event *evt )
return true;
case VLC_PLAYLIST_ADD_FILE:
#ifndef BASIC_SKINS
p_intf->p_sys->p_dialogs->ShowOpen( false );
InterfaceRefresh();
#endif
return true;
case VLC_LOG_SHOW:
#ifndef BASIC_SKINS
p_intf->p_sys->p_dialogs->ShowMessages();
#endif
return true;
case VLC_LOG_CLEAR:
return true;
case VLC_PREFS_SHOW:
#ifndef BASIC_SKINS
p_intf->p_sys->p_dialogs->ShowPrefs();
#endif
return true;
case VLC_INFO_SHOW:
#ifndef BASIC_SKINS
p_intf->p_sys->p_dialogs->ShowFileInfo();
#endif
return true;
case VLC_INTF_REFRESH:
......@@ -340,9 +330,7 @@ void VlcProc::LoadSkin()
{
if( p_intf->p_sys->p_new_theme_file == NULL )
{
#ifndef BASIC_SKINS
p_intf->p_sys->p_dialogs->ShowOpenSkin();
#endif
}
else
{
......@@ -437,10 +425,8 @@ void VlcProc::PlayStream()
if( !p_intf->p_sys->p_playlist->i_size )
{
#ifndef BASIC_SKINS
p_intf->p_sys->p_dialogs->ShowOpen( true );
InterfaceRefresh();
#endif
return;
}
......
modules/gui/skins/src/window.cpp
View file @ 586295b9
......@@ -2,7 +2,7 @@
* window.cpp: Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: window.cpp,v 1.28 2003/06/09 14:04:20 asmax Exp $
* $Id: window.cpp,v 1.29 2003/06/10 11:43:40 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -424,12 +424,10 @@ void SkinWindow::MouseUp( int x, int y, int button )
}
}
#ifndef BASIC_SKINS
if( i < 0 && button == MOUSE_RIGHT )
{
p_intf->p_sys->p_dialogs->ShowPopup();
}
#endif
}
//---------------------------------------------------------------------------
void SkinWindow::MouseDblClick( int x, int y, int button )
......
modules/gui/skins/x11/x11_theme.cpp
View file @ 586295b9
......@@ -2,7 +2,7 @@
* x11_theme.cpp: X11 implementation of the Theme class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: x11_theme.cpp,v 1.11 2003/06/09 12:33:17 asmax Exp $
* $Id: x11_theme.cpp,v 1.12 2003/06/10 11:43:41 gbazin Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
......@@ -61,7 +61,7 @@ X11Theme::X11Theme( intf_thread_t *_p_intf ) : Theme( _p_intf )
X11Theme::~X11Theme()
{
XLOCK;
XDestroyWindow( display, p_intf->p_sys->mainWin );
//XDestroyWindow( display, p_intf->p_sys->mainWin );
XUNLOCK;
}
//---------------------------------------------------------------------------
......
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