Navigation

Changeset d7892111cd0b472b98175ee7db350edd5b5cafc8

Timestamp:

03/14/07 18:40:40 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1173894040 +0000

git-parent:

[ab8bf7fc2883288d46310a11bd47f3f47219c913]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1173894040 +0000

Message:

Convert from locale before passing to LibVLC - closes #838

Files:

r8353a94	rd789211
33	33	#include <locale.h>
34	34
	35	/* Explicit HACK */
	36	extern void LocaleFree (const char *);
	37	extern char FromLocale (const char );
	38
35	39
36	40	/*****************************************************************************
…	…
90	94	if( i_ret < 0 )
91	95	{
92		return i_ret;
	96	return -i_ret;
93	97	}
94	98
…	…
144	148	{
145	149	/* failed!, quit */
146		return -1;
	150	return 1;
147	151	}
148	152	}
…	…
155	159	{
156	160	/* failed!, quit */
157		return -1;
	161	return 1;
158	162	}
159	163	}
160	164	}
161		#endif
	165	else
	166	#endif
	167	{
	168	for (int i = 0; i < i_argc; i++)
	169	if ((ppsz_argv[i] = FromLocale (ppsz_argv[i])) == NULL)
	170	return 1; // BOOM!
	171	}
162	172
163	173	/* Initialize libvlc */
…	…
166	176	{
167	177	VLC_Destroy( 0 );
168		return i_ret == VLC_EEXITSUCCESS ? 0 : i_ret;
	178	return i_ret == VLC_EEXITSUCCESS ? 0 : -i_ret;
169	179	}
170	180
…	…
178	188	/* Destroy the libvlc structure */
179	189	VLC_Destroy( 0 );
	190
	191	for (int i = 0; i < i_argc; i++)
	192	LocaleFree (ppsz_argv[i]);
180	193
181	194	#if !defined(WIN32) && !defined(UNDER_CE)
…	…
190	203	#endif
191	204
192		return i_ret;
	205	return -i_ret;
193	206	}
194	207