/*****************************************************************************
* win32_specific.c: Win32 specific features
*****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
+ * Copyright (C) 2001-2004 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <string.h> /* strdup() */
-#include <stdlib.h> /* free() */
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "vlc_playlist.h"
+#include "../libvlc.h"
+#include <vlc_playlist.h>
+#include <vlc_charset.h>
#ifdef WIN32 /* optind, getopt(), included in unistd.h */
# include "../extras/getopt.h"
# include <fcntl.h>
#endif
-#include <winsock2.h>
+#include <winsock.h>
/*****************************************************************************
* system_Init: initialize winsock and misc other things.
*****************************************************************************/
-void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
+void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
{
WSADATA Data;
if( (psz_vlc = strrchr( psz_path, '\\' )) ) *psz_vlc = '\0';
- p_this->p_libvlc->psz_vlcpath = strdup( psz_path );
+#ifndef HAVE_RELEASE
+ {
+ /* remove trailing \.libs from executable dir path if seen,
+ we assume we are running vlc through libtool wrapper in build dir */
+ int offset = strlen(psz_path)-sizeof("\\.libs")+1;
+ if( offset > 0 )
+ {
+ psz_vlc = psz_path+offset;
+ if( ! strcmp(psz_vlc, "\\.libs") ) *psz_vlc = '\0';
+ }
+ }
+#endif
+
+ vlc_global()->psz_vlcpath = strdup( psz_path );
/* Set the default file-translation mode */
#if !defined( UNDER_CE )
_fmode = _O_BINARY;
-#endif
_setmode( _fileno( stdin ), _O_BINARY ); /* Needed for pipes */
+#endif
/* Call mdate() once to make sure it is initialized properly */
mdate();
/* WinSock Library Init. */
- if( !WSAStartup( MAKEWORD( 2, 0 ), &Data ) )
+ if( !WSAStartup( MAKEWORD( 2, 2 ), &Data ) )
{
- /* Confirm that the WinSock DLL supports 2.0.*/
- if( LOBYTE( Data.wVersion ) != 2 || HIBYTE( Data.wVersion ) != 0 )
- {
+ /* Aah, pretty useless check, we should always have Winsock 2.2
+ * since it appeared in Win98. */
+ if( LOBYTE( Data.wVersion ) != 2 || HIBYTE( Data.wVersion ) != 2 )
/* We could not find a suitable WinSock DLL. */
WSACleanup( );
- }
else
- {
/* Everything went ok. */
return;
- }
}
/* Let's try with WinSock 1.1 */
{
/* Confirm that the WinSock DLL supports 1.1.*/
if( LOBYTE( Data.wVersion ) != 1 || HIBYTE( Data.wVersion ) != 1 )
- {
/* We could not find a suitable WinSock DLL. */
WSACleanup( );
- }
else
- {
/* Everything went ok. */
return;
- }
}
fprintf( stderr, "error: can't initialize WinSocks\n" );
-
- return;
}
/*****************************************************************************
static void IPCHelperThread( vlc_object_t * );
LRESULT CALLBACK WMCOPYWNDPROC( HWND, UINT, WPARAM, LPARAM );
-void system_Configure( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
+void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
{
#if !defined( UNDER_CE )
- p_this->p_libvlc->b_fast_mutex = config_GetInt( p_this, "fast-mutex" );
- p_this->p_libvlc->i_win9x_cv = config_GetInt( p_this, "win9x-cv-method" );
-
/* Raise default priority of the current process */
#ifndef ABOVE_NORMAL_PRIORITY_CLASS
# define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000
}
}
- if( config_GetInt( p_this, "one-instance" ) )
+ if( config_GetInt( p_this, "one-instance" )
+ || ( config_GetInt( p_this, "one-instance-when-started-from-file" )
+ && config_GetInt( p_this, "started-from-file" ) ) )
{
HANDLE hmutex;
msg_Info( p_this, "one instance mode ENABLED");
/* Use a named mutex to check if another instance is already running */
- if( ( hmutex = CreateMutex( NULL, TRUE, "VLC ipc "VERSION ) ) == NULL )
+ if( !( hmutex = CreateMutex( 0, TRUE, _T("VLC ipc ") _T(VERSION) ) ) )
{
/* Failed for some reason. Just ignore the option and go on as
* normal. */
/* Locate the window created by the IPC helper thread of the
* 1st instance */
- if( ( ipcwindow = FindWindow( NULL, "VLC ipc "VERSION ) )
- == NULL )
+ if( !( ipcwindow = FindWindow( 0, _T("VLC ipc ") _T(VERSION) ) ) )
{
msg_Err( p_this, "one instance mode DISABLED "
"(couldn't find 1st instance of program)" );
MSG message;
ipcwindow =
- CreateWindow( "STATIC", /* name of window class */
- "VLC ipc "VERSION, /* window title bar text */
+ CreateWindow( _T("STATIC"), /* name of window class */
+ _T("VLC ipc ") _T(VERSION), /* window title bar text */
0, /* window style */
0, /* default X coordinate */
0, /* default Y coordinate */
{
i_options++;
}
-
- playlist_AddExt( p_playlist, ppsz_argv[i_opt],ppsz_argv[i_opt],
- PLAYLIST_APPEND | (i_opt? 0 : PLAYLIST_GO),
+ if( i_opt || config_GetInt( p_this, "playlist-enqueue" ) )
+ {
+ playlist_AddExt( p_playlist, ppsz_argv[i_opt],
+ NULL, PLAYLIST_APPEND ,
PLAYLIST_END, -1,
(char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
- i_options );
+ i_options, VLC_TRUE, VLC_FALSE );
+ } else {
+ playlist_AddExt( p_playlist, ppsz_argv[i_opt],
+ NULL, PLAYLIST_APPEND | PLAYLIST_GO,
+ PLAYLIST_END, -1,
+ (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
+ i_options, VLC_TRUE, VLC_FALSE );
+ }
i_opt += i_options;
}
/*****************************************************************************
* system_End: terminate winsock.
*****************************************************************************/
-void system_End( vlc_t *p_this )
+void system_End( libvlc_int_t *p_this )
{
+ if( p_this && vlc_global() )
+ {
+ free( vlc_global()->psz_vlcpath );
+ vlc_global()->psz_vlcpath = NULL;
+ }
+
WSACleanup();
}
projects / vlc / blobdiff