*
* 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() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#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"
#if !defined( UNDER_CE )
# include <io.h>
# include <fcntl.h>
+# include <mmsystem.h>
#endif
#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, const 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;
_setmode( _fileno( stdin ), _O_BINARY ); /* Needed for pipes */
+
+ timeBeginPeriod(5);
#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 );
+typedef struct
+{
+ int argc;
+ int enqueue;
+ char data[0];
+} vlc_ipc_data_t;
-void system_Configure( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
+void system_Configure( libvlc_int_t *p_this, int *pi_argc, const 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;
if( *pi_argc - 1 >= optind )
{
COPYDATASTRUCT wm_data;
- int i_opt, i_data;
- char *p_data;
+ int i_opt;
+ vlc_ipc_data_t *p_data;
+ size_t i_data = sizeof (*p_data);
- i_data = sizeof(int);
for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
{
- i_data += sizeof(int);
+ i_data += sizeof (size_t);
i_data += strlen( ppsz_argv[ i_opt ] ) + 1;
}
- p_data = (char *)malloc( i_data );
- *((int *)&p_data[0]) = *pi_argc - optind;
- i_data = sizeof(int);
+ p_data = malloc( i_data );
+ p_data->argc = *pi_argc - optind;
+ p_data->enqueue = config_GetInt( p_this, "playlist-enqueue" );
+ i_data = 0;
for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
{
- int i_len = strlen( ppsz_argv[ i_opt ] ) + 1;
- *((int *)&p_data[i_data]) = i_len;
- i_data += sizeof(int);
- memcpy( &p_data[i_data], ppsz_argv[ i_opt ], i_len );
+ size_t i_len = strlen( ppsz_argv[ i_opt ] ) + 1;
+ /* Windows will never switch to an architecture
+ * with stronger alignment requirements, right. */
+ *((size_t *)(p_data->data + i_data)) = i_len;
+ i_data += sizeof (size_t);
+ memcpy( &p_data->data[i_data], ppsz_argv[ i_opt ], i_len );
i_data += i_len;
}
+ i_data += sizeof (*p_data);
/* Send our playlist items to the 1st instance */
wm_data.dwData = 0;
if( pwm_data->lpData )
{
- int i_argc, i_data, i_opt, i_options;
char **ppsz_argv;
- char *p_data = (char *)pwm_data->lpData;
+ vlc_ipc_data_t *p_data = (vlc_ipc_data_t *)pwm_data->lpData;
+ size_t i_data = 0;
+ int i_argc = p_data->argc, i_opt, i_options;
- i_argc = *((int *)&p_data[0]);
ppsz_argv = (char **)malloc( i_argc * sizeof(char *) );
- i_data = sizeof(int);
for( i_opt = 0; i_opt < i_argc; i_opt++ )
{
- ppsz_argv[i_opt] = &p_data[i_data + sizeof(int)];
- i_data += *((int *)&p_data[i_data]);
- i_data += sizeof(int);
+ ppsz_argv[i_opt] = p_data->data + i_data + sizeof(int);
+ i_data += sizeof(int) + *((int *)(p_data->data + i_data));
}
for( i_opt = 0; i_opt < i_argc; i_opt++ )
{
i_options++;
}
- if( i_opt || config_GetInt( p_this, "playlist-enqueue" ) )
- {
- playlist_AddExt( p_playlist, ppsz_argv[i_opt],
- ppsz_argv[i_opt], PLAYLIST_APPEND ,
- PLAYLIST_END, -1,
- (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
- i_options );
- } else {
- playlist_AddExt( p_playlist, ppsz_argv[i_opt],
- ppsz_argv[i_opt], PLAYLIST_APPEND | PLAYLIST_GO,
- PLAYLIST_END, -1,
- (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
- i_options );
- }
+ playlist_AddExt( p_playlist, ppsz_argv[i_opt],
+ NULL, PLAYLIST_APPEND |
+ ( ( i_opt || p_data->enqueue ) ? 0 : 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;
+ }
+
+#if !defined( UNDER_CE )
+ timeEndPeriod(5);
+#endif
+
WSACleanup();
}
projects / vlc / blobdiff