Navigation

← Previous Changeset
Next Changeset →

Changeset 6dafa419846a89a815750f3de722d8d675699658

Timestamp:

03/10/02 19:01:59 (6 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1033664519 +0000

git-parent:

[145b1961b4825d2a8d807bf02db90440a8c45380]

git-author:

Gildas Bazin <gbazin@videolan.org> 1033664519 +0000

Message:

* FAQ: updated FAQ with config file issues.
* configure.ac.in: use -mms-bitfields instead of -fnative-struct for

mingw32 gcc-3.x.

* include/interface.h, modules/misc/dummy/interface.c, modules/misc/logger/logger.c,

modules/control/rc/rc.c: Display message on Win32 explaining how to get
back to the GUI mode.

* src/misc/threads.c, include/vlc_threads_funcs.h: ignore the

win9x-cv-method config option on WinNT when fast-mutex is not enabled.

Files:

FAQ (modified) (2 diffs)
configure.ac.in (modified) (2 diffs)
include/interface.h (modified) (3 diffs)
include/vlc_threads_funcs.h (modified) (2 diffs)
modules/control/rc/rc.c (modified) (2 diffs)
modules/misc/dummy/interface.c (modified) (2 diffs)
modules/misc/logger/logger.c (modified) (2 diffs)
src/misc/threads.c (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

FAQ

r67e0e79	r6dafa41
1	1	Frequentely Asked Questions for VideoLAN Client
2		$Id: FAQ,v 1.1~~0 2002/07/25 22:34:37 lool~~ Exp $
	2	$Id: FAQ,v 1.11 2002/10/03 17:01:59 gbazin Exp $
3	3
4	4	1. Using VLC
…	…
74	74	deb ftp://ftp.videolan.org/pub/videolan/ debian/
75	75	deb-src ftp://ftp.videolan.org/pub/videolan/ debian/
	76
	77	1.10 How can I save my VLC configuration ?
	78	----------------------------------------
	79	Currently, the only way to save the configuration options in VLC is through
	80	the preferences menu in one of the graphical user interface plugins.
	81
	82	1.11 Where does VLC store it's config file ?
	83	------------------------------------------
	84	Currently, a config file is created on a per user basis (there is no global
	85	configuration file). If you modify the available options in VLC and save the
	86	new configuration, then a configuration file will be created in your user
	87	directory. The precise location of this file depends on the Operating System
	88	you are running:
	89
	90	- Unices (linux, etc...): "~/.videolan/vlcrc"
	91	- Windows: "Application Data\videolan\vlcrc"
	92
	93	1.12 I don't have access to the GUI anymore
	94	-------------------------------------------
	95	If you change the default interface module in the preferences menu to a non
	96	GUI module (ie. to a command line interface) and then save the configuration,
	97	the only way to get VLC to show a GUI again is to run it directly from the
	98	command line.
	99	For instance on Windows, you need to open a dos command box, go to the
	100	directory where you installed VLC (usually
	101	c:\Program Files\VideoLAN\VideoLAN Client) and then type "vlc --intf win32"
	102	You will then be able to modify the configuration again and save it.
76	103
77	104

configure.ac.in

r5c05d05	r6dafa41
99	99	SYS=mingw32
100	100	AC_CHECK_TOOL(WINDRES, windres, :)
101		~~CFLAGS_save="${CFLAGS_save} -fnative-struct"; CFLAGS="${CFLAGS_save}"~~
102	101	CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
103	102	LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -mwindows -Xlinker --force-exe-suffix"
…	…
145	144	AC_MSG_RESULT(${LIBEXT})
146	145
	146	dnl Check for fnative-struct or mms-bitfields support for mingw32
	147	if test x$SYS = xmingw32
	148	then
	149	AC_CACHE_CHECK([if \$CC accepts -mms-bitfields],
	150	[ac_cv_c_mms_bitfields],
	151	[CFLAGS="${CFLAGS_save} -mms-bitfields"
	152	AC_TRY_COMPILE([],,ac_cv_c_mms_bitfields=yes, ac_cv_c_mms_bitfields=no)])
	153	if test x"$ac_cv_c_mms_bitfields" != x"no"; then
	154	CFLAGS_mingw32_special="-mms-bitfields"
	155	else
	156	CFLAGS_mingw32_special="-fnative-struct"
	157	fi
	158
	159	CFLAGS_save="${CFLAGS_save} ${CFLAGS_mingw32_special}"; CFLAGS="${CFLAGS_save}"
	160	fi
	161
147	162	dnl Flags for plugin compilation
148	163	case "x${SYS}" in
149	164	xmingw32\|xcygwin)
150		CFLAGS_pics="${CFLAGS_pics} ~~-fnative-struct~~"
151		CXXFLAGS_pics="${CXXFLAGS_pics} ~~-fnative-struct~~"
152		OBJCFLAGS_pics="${OBJCFLAGS_pics} ~~-fnative-struct~~"
153		CFLAGS_plugins="${CFLAGS_plugins} ~~-fnative-struct~~"
154		CXXFLAGS_plugins="${CXXFLAGS_plugins} ~~-fnative-struct~~"
155		OBJCFLAGS_plugins="${OBJCFLAGS_plugins} ~~-fnative-struct~~"
	165	CFLAGS_pics="${CFLAGS_pics} ${CFLAGS_mingw32_special}"
	166	CXXFLAGS_pics="${CXXFLAGS_pics} ${CFLAGS_mingw32_special}"
	167	OBJCFLAGS_pics="${OBJCFLAGS_pics} ${CFLAGS_mingw32_special}"
	168	CFLAGS_plugins="${CFLAGS_plugins} ${CFLAGS_mingw32_special}"
	169	CXXFLAGS_plugins="${CXXFLAGS_plugins} ${CFLAGS_mingw32_special}"
	170	OBJCFLAGS_plugins="${OBJCFLAGS_plugins} ${CFLAGS_mingw32_special}"
156	171	;;
157	172	x*)

include/interface.h

r976dfc3	r6dafa41
5	5	*****************************************************************************
6	6	* Copyright (C) 1999, 2000 VideoLAN
7		* $Id: interface.h,v 1.3~~3 2002/07/31 20:56:50 sam~~ Exp $
	7	* $Id: interface.h,v 1.34 2002/10/03 17:01:59 gbazin Exp $
8	8	*
9	9	* Authors: Vincent Seguin <seguin@via.ecp.fr>
…	…
27	27	* intf_thread_t: describe an interface thread
28	28	*****************************************************************************
29		* This structe describes all interface-specific data of the main (interface)
	29	* This struct describes all interface-specific data of the main (interface)
30	30	* thread.
31	31	*****************************************************************************/
…	…
60	60	VLC_EXPORT( void, intf_Destroy, ( intf_thread_t * ) );
61	61
	62	/*****************************************************************************
	63	* Macros
	64	*****************************************************************************/
	65	#ifdef WIN32
	66	# define CONSOLE_INTRO_MSG \
	67	AllocConsole(); \
	68	freopen( "CONOUT$", "w", stdout ); \
	69	freopen( "CONOUT$", "w", stderr ); \
	70	freopen( "CONIN$", "r", stdin ); \
	71	intf_Msg( VERSION_MESSAGE ); \
	72	intf_Msg( _("\nWarning: if you can't access the GUI anymore, "\
	73	"open a dos command box, go to the directory " \
	74	"where you installed VLC and run " \
	75	"\"vlc -I win32\"\n") )
	76	#else
	77	# define CONSOLE_INTRO_MSG
	78	#endif

include/vlc_threads_funcs.h

rb7d33a0	r6dafa41
4	4	*****************************************************************************
5	5	* Copyright (C) 1999, 2002 VideoLAN
6		* $Id: vlc_threads_funcs.h,v 1.~~3 2002/08/30 19:16:05 sam~~ Exp $
	6	* $Id: vlc_threads_funcs.h,v 1.4 2002/10/03 17:01:59 gbazin Exp $
7	7	*
8	8	* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
…	…
492	492	p_condvar->i_waiting_threads++;
493	493
494		if( p_~~condvar->SignalObjectAndWait && p_~~mutex->mutex )
	494	if( p_mutex->mutex )
495	495	{
496	496	/* It is only possible to atomically release the mutex and

modules/control/rc/rc.c

r145b196	r6dafa41
3	3	*****************************************************************************
4	4	* Copyright (C) 2001 VideoLAN
5		* $Id: rc.c,v 1.~~6 2002/10/03 13:21:55 sam~~ Exp $
	5	* $Id: rc.c,v 1.7 2002/10/03 17:01:59 gbazin Exp $
6	6	*
7	7	* Authors: Peter Surda <shurdeek@panorama.sth.ac.at>
…	…
97	97	p_intf->pf_run = Run;
98	98
99		#ifdef WIN32
100		AllocConsole();
101		freopen( "CONOUT$", "w", stdout );
102		freopen( "CONOUT$", "w", stderr );
103		freopen( "CONIN$", "r", stdin );
104		printf( VERSION_MESSAGE "\n" );
105		#endif
	99	CONSOLE_INTRO_MSG;
106	100
107	101	printf( "remote control interface initialized, `h' for help\n" );

modules/misc/dummy/interface.c

r19ea8fe	r6dafa41
3	3	*****************************************************************************
4	4	* Copyright (C) 2000, 2001 VideoLAN
5		* $Id: interface.c,v 1.~~1 2002/08/04 17:23:43 sam~~ Exp $
	5	* $Id: interface.c,v 1.2 2002/10/03 17:01:58 gbazin Exp $
6	6	*
7	7	* Authors: Samuel Hocevar <sam@zoy.org>
…	…
42	42	{
43	43	intf_thread_t p_intf = (intf_thread_t) p_this;
44		#ifdef WIN32
45		AllocConsole();
46		freopen( "CONOUT$", "w", stdout );
47		freopen( "CONOUT$", "w", stderr );
48		freopen( "CONIN$", "r", stdin );
49		msg_Info( p_intf, VERSION_MESSAGE );
50		msg_Info( p_intf, _("\nUsing the dummy interface plugin...") );
51		#endif
	44
	45	CONSOLE_INTRO_MSG;
	46	msg_Info( p_intf, _("Using the dummy interface plugin...") );
52	47
53	48	p_intf->pf_run = Run;

modules/misc/logger/logger.c

ra60541d	r6dafa41
3	3	*****************************************************************************
4	4	* Copyright (C) 2002 VideoLAN
5		* $Id: logger.c,v 1.~~2 2002/08/24 17:04:36~~ gbazin Exp $
	5	* $Id: logger.c,v 1.3 2002/10/03 17:01:58 gbazin Exp $
6	6	*
7	7	* Authors: Samuel Hocevar <sam@zoy.org>
…	…
99	99	char psz_mode, psz_file;
100	100
101		#ifdef WIN32
102		AllocConsole();
103		freopen( "CONOUT$", "w", stdout );
104		freopen( "CONOUT$", "w", stderr );
105		freopen( "CONIN$", "r", stdin );
106		msg_Info( p_intf, VERSION_MESSAGE );
107		msg_Info( p_intf, _("\nUsing the logger interface plugin...") );
108		#endif
	101	CONSOLE_INTRO_MSG;
	102	msg_Info( p_intf, _("Using the logger interface plugin...") );
109	103
110	104	/* Allocate instance and initialize some members */

src/misc/threads.c

r145b196	r6dafa41
3	3	*****************************************************************************
4	4	* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
5		* $Id: threads.c,v 1.1~~8 2002/10/03 13:21:55 sam~~ Exp $
	5	* $Id: threads.c,v 1.19 2002/10/03 17:01:58 gbazin Exp $
6	6	*
7	7	* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
…	…
382	382	p_condvar->SignalObjectAndWait = p_this->p_vlc->SignalObjectAndWait;
383	383
384		if( p_this->p_vlc->i_win9x_cv == 0 )
	384	if( (p_condvar->SignalObjectAndWait && !p_this->p_vlc->b_fast_mutex)
	385	\|\| p_condvar->i_win9x_cv == 0 )
385	386	{
386	387	/* Create an auto-reset event. */

Navigation

Changeset 6dafa419846a89a815750f3de722d8d675699658

Legend:

Download in other formats: