Commit f17a4ccd authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Remove unneeded patches

wasapi isn't used anymore and cmdline patch was usefull for the early
stage to know why libvlc would fail.
parent b4c22ecd
From 404aa907e5a0897be2080c6808c19817f625303a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Feb 2015 11:58:54 +0100
Subject: [PATCH 01/37] wasapi: Don't fail if the client is already initialized
make the extra test only for Winstore builds
---
modules/audio_output/wasapi.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/modules/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index 9f6d260ccd..fa9eeed116 100644
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -596,7 +596,11 @@ static HRESULT Start(aout_stream_t *s, audio_sample_format_t *restrict pfmt,
hr = IAudioClient_Initialize(sys->client, shared_mode, 0, buffer_duration,
0, pwf, sid);
CoTaskMemFree(pwf_closest);
- if (FAILED(hr))
+ if (FAILED(hr)
+#if VLC_WINSTORE_APP
+ && hr != AUDCLNT_E_ALREADY_INITIALIZED
+#endif
+ )
{
msg_Err(s, "cannot initialize audio client (error 0x%lx)", hr);
goto error;
--
2.19.2
From c02adeb698d948e86b141e33efd16689a03b67bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 2 Aug 2016 18:54:28 +0200
Subject: [PATCH 05/37] config: cmdline: Use msg_* instead of fprintf
---
src/config/cmdline.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/config/cmdline.c b/src/config/cmdline.c
index 535306cc1c..02a88b46d3 100644
--- a/src/config/cmdline.c
+++ b/src/config/cmdline.c
@@ -204,8 +204,8 @@ int config_LoadCmdLine( vlc_object_t *p_this, int i_argc,
/* Check if the option is deprecated */
if( p_conf->b_removed )
{
- fprintf(stderr,
- "Warning: option --%s no longer exists.\n",
+ msg_Warn(p_this,
+ "Warning: option --%s no longer exists.",
psz_name);
continue;
}
@@ -275,17 +275,17 @@ int config_LoadCmdLine( vlc_object_t *p_this, int i_argc,
/* Internal error: unknown option */
if( !b_ignore_errors )
{
- fputs( "vlc: unknown option"
- " or missing mandatory argument ", stderr );
if( state.opt )
{
- fprintf( stderr, "`-%c'\n", state.opt );
+ msg_Err( p_this, "vlc: unknown option"
+ " or missing mandatory argument `-%c'", state.opt );
}
else
{
- fprintf( stderr, "`%s'\n", ppsz_argv[state.ind-1] );
+ msg_Err( p_this, "vlc: unknown option"
+ " or missing mandatory argument `-%s'", ppsz_argv[state.ind-1] );
}
- fputs( "Try `vlc --help' for more information.\n", stderr );
+ msg_Err( p_this, "Try `vlc --help' for more information." );
goto out;
}
}
--
2.19.2
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