Commit da580de6 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Add TVVLCKit

parent 8ff9e574
......@@ -3,8 +3,10 @@
*.pbxuser
xcuserdata
project.xcworkspace
MobileVLCKit/vlc-plugins.xcconfig
MobileVLCKit/vlc-plugins.h
MobileVLCKit/vlc-plugins-AppleTV.h
MobileVLCKit/vlc-plugins-AppleTV.xcconfig
MobileVLCKit/vlc-plugins-iPhone.h
MobileVLCKit/vlc-plugins-iPhone.xcconfig
.DS_Store
build
/vlc-unstable
......
This diff is collapsed.
From 89565c4b412d8db0c73f5c3e66b75c7f2cb9fc54 Mon Sep 17 00:00:00 2001
From 511e1f215608bedf9f72adcf87f5ce73c92ee375 Mon Sep 17 00:00:00 2001
From: David Geldreich <david.geldreich@free.fr>
Date: Fri, 20 Apr 2012 16:41:19 +0200
Subject: [PATCH 01/13] arm_neon: added function macro to handle the underscore
......
From 9684fd3703bd1e3d5bb08d0352c3a6188f98ae6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 19:58:40 +0200
Subject: [PATCH 1/2] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 4a5f2a0..79b28e4 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -63,7 +63,7 @@ static uint32_t cpu_flags;
#if defined (__i386__) || defined (__x86_64__) || defined (__powerpc__) \
|| defined (__ppc__) || defined (__ppc64__) || defined (__powerpc64__)
-# if !defined (_WIN32) && !defined (__OS2__)
+# if !defined (_WIN32) && !defined (__OS2__) && !defined (__APPLE__)
static bool vlc_CPU_check (const char *name, void (*func) (void))
{
pid_t pid = fork();
--
2.5.1
From 25263f49ca2f8438f567ed74051ad854894ad2a3 Mon Sep 17 00:00:00 2001
From fab89c00905a120d23d875056869241a091b9089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:02:07 +0200
Subject: [PATCH 02/13] deinterlace/merge: use a macro to fix compilation for
......
From 37a7ea8e90cc67762e237419f72195b83b9d1cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 11 Sep 2015 16:47:49 +0200
Subject: [PATCH 2/2] libvlc: remove daemon mode
---
src/interface/interface.c | 10 ++--------
src/libvlc-module.c | 15 ++-------------
src/libvlc.c | 48 -----------------------------------------------
3 files changed, 4 insertions(+), 69 deletions(-)
diff --git a/src/interface/interface.c b/src/interface/interface.c
index 4bc709a..8321654 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -197,14 +197,8 @@ int libvlc_InternalAddIntf(libvlc_int_t *libvlc, const char *name)
char *intf = var_InheritString(libvlc, "intf");
if (intf == NULL) /* "intf" has not been set */
{
-#if !defined(_WIN32) && !defined(__OS2__)
- char *pidfile = var_InheritString(libvlc, "pidfile");
- if (pidfile != NULL)
- free(pidfile);
- else
-#endif
- msg_Info(libvlc, _("Running vlc with the default interface. "
- "Use 'cvlc' to use vlc without interface."));
+ msg_Info(libvlc, _("Running vlc with the default interface. "
+ "Use 'cvlc' to use vlc without interface."));
}
ret = intf_Create(playlist, intf);
free(intf);
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index a13093d..1cdbdd5 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1030,14 +1030,6 @@ static const char *const ppsz_prefres[] = {
#define STATS_LONGTEXT N_( \
"Collect miscellaneous local statistics about the playing media.")
-#define DAEMON_TEXT N_("Run as daemon process")
-#define DAEMON_LONGTEXT N_( \
- "Runs VLC as a background daemon process.")
-
-#define PIDFILE_TEXT N_("Write process id to file")
-#define PIDFILE_LONGTEXT N_( \
- "Writes process id into specified file.")
-
#define ONEINSTANCE_TEXT N_("Allow only one running instance")
#if defined( _WIN32 ) || defined( __OS2__ )
#define ONEINSTANCE_LONGTEXT N_( \
@@ -2035,11 +2027,8 @@ vlc_module_begin ()
change_volatile ()
add_obsolete_string( "verbose-objects" ) /* since 2.1.0 */
#if !defined(_WIN32) && !defined(__OS2__)
- add_bool( "daemon", 0, DAEMON_TEXT, DAEMON_LONGTEXT, true )
- change_short('d')
-
- add_string( "pidfile", NULL, PIDFILE_TEXT, PIDFILE_LONGTEXT,
- false )
+ add_obsolete_bool( "daemon" )
+ add_obsolete_string( "pidfile" )
#endif
#if defined (_WIN32) || defined (__APPLE__)
diff --git a/src/libvlc.c b/src/libvlc.c
index 34824da..20c1f87 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -199,42 +199,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
return VLC_ENOMOD;
}
-#ifdef HAVE_DAEMON
- /* Check for daemon mode */
- if( var_InheritBool( p_libvlc, "daemon" ) )
- {
- if( daemon( 1, 0) != 0 )
- {
- msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
- vlc_LogDeinit (p_libvlc);
- module_EndBank (true);
- return VLC_ENOMEM;
- }
-
- /* lets check if we need to write the pidfile */
- char *pidfile = var_InheritString( p_libvlc, "pidfile" );
- if( pidfile != NULL )
- {
- FILE *stream = vlc_fopen( pidfile, "w" );
- if( stream != NULL )
- {
- fprintf( stream, "%d", (int)getpid() );
- fclose( stream );
- msg_Dbg( p_libvlc, "written PID file %s", pidfile );
- }
- else
- msg_Err( p_libvlc, "cannot write PID file %s: %s",
- pidfile, vlc_strerror_c(errno) );
- free( pidfile );
- }
- }
- else
- {
- var_Create( p_libvlc, "pidfile", VLC_VAR_STRING );
- var_SetString( p_libvlc, "pidfile", "" );
- }
-#endif
-
/* FIXME: could be replaced by using Unix sockets */
#ifdef HAVE_DBUS
@@ -511,18 +475,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
}
#endif
-#if !defined( _WIN32 ) && !defined( __OS2__ )
- char *pidfile = var_InheritString( p_libvlc, "pidfile" );
- if( pidfile != NULL )
- {
- msg_Dbg( p_libvlc, "removing PID file %s", pidfile );
- if( unlink( pidfile ) )
- msg_Warn( p_libvlc, "cannot remove PID file %s: %s",
- pidfile, vlc_strerror_c(errno) );
- free( pidfile );
- }
-#endif
-
if (priv->parser != NULL)
playlist_preparser_Delete(priv->parser);
--
2.5.1
From 5bb95788397dc4be5a497ed260497133392dba48 Mon Sep 17 00:00:00 2001
From 837dc0740a82c2c7cf734213ffc5e2b714a5775f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 29 May 2013 13:25:54 +0200
Subject: [PATCH 03/13] libass: fix text rendering on iOS by providing a font
......
From 211592b2a265569db5889e97d6c7eb9a111e4815 Mon Sep 17 00:00:00 2001
From ceba5188773cc8faeb3c8b95f451436becf8c7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 13:55:16 +0100
Subject: [PATCH 04/13] freetype: added a fake font lookup mechanism for iOS to
......
From ffc12c5e40be6990298cefd73d95be38f484ef56 Mon Sep 17 00:00:00 2001
From db872f03d5ddd2f86778de022846149d7dde93a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 9 Dec 2014 22:14:55 +0100
Subject: [PATCH 06/13] lib/media player: inherit deinterlace variable to
Subject: [PATCH 05/13] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......
From 275aee51004bb7c934e787b9446a8d35f05f887d Mon Sep 17 00:00:00 2001
From e2967d6ac21dfc8b737ee815b00e7108b9d738c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 18 Feb 2015 21:35:16 +0100
Subject: [PATCH 07/13] arm_neon: work-around libtool issue
Subject: [PATCH 06/13] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From 13a062f670cc6c3d9f5c6167bd8be64bb14ccf43 Mon Sep 17 00:00:00 2001
From 6c281b6c77325bd1d4a123eed7fd79f2fb7f4935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 19 Jun 2015 15:26:06 +0200
Subject: [PATCH 08/13] libvlc/media: re-parse if flags changed
Subject: [PATCH 07/13] libvlc/media: re-parse if flags changed
---
lib/media.c | 6 ++++++
......
From b61af62ad15909d14676d5a2262a2d65b391e8e2 Mon Sep 17 00:00:00 2001
From 642d87c7a95a3192b272ffba4c6c5e69caac3503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 31 Mar 2014 17:54:01 +0200
Subject: [PATCH 09/13] libvlc: add preliminary code path to modify quartztext
Subject: [PATCH 08/13] libvlc: add preliminary code path to modify quartztext
variables on-the-fly
---
......@@ -45,10 +45,10 @@ index 0c7351b..b0b4208 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 487fcba..06c9826 100644
index a7e814b..97b153b 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -226,6 +226,8 @@ libvlc_video_get_spu_count
@@ -227,6 +227,8 @@ libvlc_video_get_spu_count
libvlc_video_get_spu_delay
libvlc_video_get_spu_description
libvlc_video_get_teletext
......@@ -57,7 +57,7 @@ index 487fcba..06c9826 100644
libvlc_video_get_title_description
libvlc_video_get_track
libvlc_video_get_track_count
@@ -250,6 +252,8 @@ libvlc_video_set_spu
@@ -251,6 +253,8 @@ libvlc_video_set_spu
libvlc_video_set_spu_delay
libvlc_video_set_subtitle_file
libvlc_video_set_teletext
......
From f5cebbdbdcbda90664b2daf3fbf727f060a1cca3 Mon Sep 17 00:00:00 2001
From c428a0b86fa8df8df9bf431ad4f504b03ef4b1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 14:04:52 +0200
Subject: [PATCH 12/13] arm_neon: fix iOS linking
Subject: [PATCH 09/13] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......
From 397f6aead4e316e64f1ca220f407da274ddb6faf Mon Sep 17 00:00:00 2001
From f03186abd2d5483bdcf91afa139302435fbf79e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Jul 2015 19:57:18 +0200
Subject: [PATCH 13/13] disable neon volume plugin
Subject: [PATCH 10/13] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From 01143837e290318cad524bf3bbae18ae1989706c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 13:40:26 +0200
Subject: [PATCH 10/13] libvlc media list player: attach observer after player
instance creation
---
lib/media_list_player.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/media_list_player.c b/lib/media_list_player.c
index e6119ea..44f75a0 100644
--- a/lib/media_list_player.c
+++ b/lib/media_list_player.c
@@ -495,6 +495,7 @@ libvlc_media_list_player_new(libvlc_instance_t * p_instance)
libvlc_event_manager_release(p_mlp->p_event_manager);
goto error;
}
+ install_media_player_observer(p_mlp);
if (vlc_clone(&p_mlp->thread, playlist_thread, p_mlp,
VLC_THREAD_PRIORITY_LOW))
--
2.5.1
From 94130596a23559acf589b3248d75ff4a3d4f7dc6 Mon Sep 17 00:00:00 2001
From d2f5bfff8e390590f9acd2f7a7714b844e16f394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 7 Dec 2014 20:02:18 +0100
Subject: [PATCH 05/13] contrib/gcrypt: simplify compilation by disabling /doc
and work-around a libtool limitation
Subject: [PATCH 11/13] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
contrib/src/gcrypt/rules.mak | 2 +
.../gcrypt/work-around-libtool-limitation.patch | 25 +++++++++++++
3 files changed, 70 insertions(+)
create mode 100644 contrib/src/gcrypt/disable-doc-compilation.patch
contrib/src/gcrypt/rules.mak | 1 +
.../gcrypt/work-around-libtool-limitation.patch | 25 ++++++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
diff --git a/contrib/src/gcrypt/disable-doc-compilation.patch b/contrib/src/gcrypt/disable-doc-compilation.patch
new file mode 100644
index 0000000..7113a31
--- /dev/null
+++ b/contrib/src/gcrypt/disable-doc-compilation.patch
@@ -0,0 +1,43 @@
+diff -ru libgcrypt/Makefile.am libgcrypt/Makefile.am
+--- libgcrypt/Makefile.am 2014-08-18 08:46:51.000000000 +0200
++++ libgcrypt/Makefile.am 2014-12-07 19:54:02.000000000 +0100
+@@ -25,11 +25,11 @@
+ # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
+ GITLOG_TO_CHANGELOG=gitlog-to-changelog
+
+-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
+-SUBDIRS = compat mpi cipher random src doc tests
++DIST_SUBDIRS = m4 compat mpi cipher random src tests
++SUBDIRS = compat mpi cipher random src tests
+
+ EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \
+- ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \
++ ChangeLog-2011 build-aux/ChangeLog-2011 \
+ m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011 \
+ random/ChangeLog-2011 tests/ChangeLog-2011 mpi/ChangeLog-2011 \
+ build-aux/git-log-footer build-aux/git-log-fix
+Only in libgcrypt: Makefile.am.orig
+Only in libgcrypt: Makefile.am.rej
+diff -ru libgcrypt-raw/configure.ac libgcrypt/configure.ac
+--- libgcrypt-raw/configure.ac 2014-12-07 19:51:54.000000000 +0100
++++ libgcrypt/configure.ac 2014-12-07 19:52:48.000000000 +0100
+@@ -2043,7 +2043,6 @@
+ mpi/Makefile
+ cipher/Makefile
+ random/Makefile
+-doc/Makefile
+ src/Makefile
+ src/gcrypt.h
+ src/libgcrypt-config
+diff -ru libgcrypt-raw/configure.ac.orig libgcrypt/configure.ac.orig
+--- libgcrypt-raw/configure.ac.orig 2014-12-07 19:51:54.000000000 +0100
++++ libgcrypt/configure.ac.orig 2014-12-07 19:52:37.000000000 +0100
+@@ -1219,7 +1219,7 @@
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+ [[__asm__("xorl \$(123456789/12345678), %ebp;\n\t");]])],
+ [gcry_cv_gcc_as_const_division_with_wadivide_ok=yes])])
+- if test "$gcry_cv_gcc_as_const_division_ok_with_wadivide_ok" = "no" ; then
++ if test "$gcry_cv_gcc_as_const_division_with_wadivide_ok" = "no" ; then
+ # '-Wa,--divide' did not work, restore old flags.
+ CPPFLAGS="$_gcc_cppflags_save"
+ fi
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 4b2cce0..a3f1545 100644
index 55c9f4c..be97991 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -13,6 +13,8 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(UNPACK)
$(APPLY) $(SRC)/gcrypt/fix-amd64-assembly-on-solaris.patch
@@ -15,6 +15,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(APPLY) $(SRC)/gcrypt/0001-Fix-assembly-division-check.patch
$(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
+ $(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
+ $(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
$(MOVE)
DEPS_gcrypt = gpg-error
......
From 98b46970488758b32361f7f7a6581d0930927da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 13:43:36 +0200
Subject: [PATCH 11/13] libvlc media list player: add getter player instance
---
include/vlc/libvlc_media_list_player.h | 10 ++++++++++
lib/libvlc.sym | 1 +
lib/media_list_player.c | 16 +++++++++++++++-
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/include/vlc/libvlc_media_list_player.h b/include/vlc/libvlc_media_list_player.h
index b85981d..71e2ac0 100644
--- a/include/vlc/libvlc_media_list_player.h
+++ b/include/vlc/libvlc_media_list_player.h
@@ -103,6 +103,16 @@ LIBVLC_API void
libvlc_media_player_t * p_mi );
/**
+ * Get media player instance in this media_list_player instance.
+ *
+ * \param p_mlp media list player instance
+ * \return p_mi media player instance
+ * \note the caller is responsible for releasing the player instance
+ */
+LIBVLC_API libvlc_media_player_t *
+ libvlc_media_list_player_get_media_player(libvlc_media_list_player_t * p_mlp);
+
+/**
* Set the media list associated with the player
*
* \param p_mlp media list player instance
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 06c9826..97b153b 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -109,6 +109,7 @@ libvlc_media_list_lock
libvlc_media_list_media
libvlc_media_list_new
libvlc_media_list_player_event_manager
+libvlc_media_list_player_get_media_player
libvlc_media_list_player_get_state
libvlc_media_list_player_is_playing
libvlc_media_list_player_new
diff --git a/lib/media_list_player.c b/lib/media_list_player.c
index 44f75a0..b5a645e 100644
--- a/lib/media_list_player.c
+++ b/lib/media_list_player.c
@@ -1,10 +1,12 @@
/*****************************************************************************
* media_list_player.c: libvlc new API media_list player functions
*****************************************************************************
- * Copyright (C) 2007 VLC authors and VideoLAN
+ * Copyright (C) 2007-2015 VLC authors and VideoLAN
* $Id$
*
* Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
+ * Niles Bindel <zaggal69 # gmail.com>
+ * Rémi Denis-Courmont
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
@@ -601,6 +603,18 @@ void libvlc_media_list_player_set_media_player(libvlc_media_list_player_t * p_ml
}
/**************************************************************************
+ * get_media_player (Public)
+ **************************************************************************/
+libvlc_media_player_t * libvlc_media_list_player_get_media_player(libvlc_media_list_player_t * p_mlp)
+{
+ if (p_mlp->p_mi == NULL)
+ return NULL;
+
+ libvlc_media_player_retain(p_mlp->p_mi);
+ return p_mlp->p_mi;
+}
+
+/**************************************************************************
* set_media_list (Public)
**************************************************************************/
void libvlc_media_list_player_set_media_list(libvlc_media_list_player_t * p_mlp, libvlc_media_list_t * p_mlist)
--
2.5.1
From 9684fd3703bd1e3d5bb08d0352c3a6188f98ae6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 19:58:40 +0200
Subject: [PATCH 12/13] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 4a5f2a0..79b28e4 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -63,7 +63,7 @@ static uint32_t cpu_flags;
#if defined (__i386__) || defined (__x86_64__) || defined (__powerpc__) \
|| defined (__ppc__) || defined (__ppc64__) || defined (__powerpc64__)
-# if !defined (_WIN32) && !defined (__OS2__)
+# if !defined (_WIN32) && !defined (__OS2__) && !defined (__APPLE__)
static bool vlc_CPU_check (const char *name, void (*func) (void))
{
pid_t pid = fork();
--
2.5.1
From 968ff57dd5830d9962d429e5757737274305e12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 11 Sep 2015 18:34:26 +0200
Subject: [PATCH 13/13] libvlc: hack to disable daemon mode
---
src/libvlc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libvlc.c b/src/libvlc.c
index 34824da..3bb0ec1 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -199,6 +199,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
return VLC_ENOMOD;
}
+#ifdef __APPLE
+#undef HAVE_DAEMON
+#endif
+
#ifdef HAVE_DAEMON
/* Check for daemon mode */
if( var_InheritBool( p_libvlc, "daemon" ) )
--
2.5.1
......@@ -25,8 +25,10 @@
#import "VLCLibrary.h"
#import "VLCLibVLCBridging.h"
#if TARGET_OS_IPHONE
# include "vlc-plugins.h"
#if TARGET_OS_TV
# include "vlc-plugins-AppleTV.h"
#elif TARGET_OS_IPHONE
# include "vlc-plugins-iPhone.h"
#endif
#ifdef HAVE_CONFIG_H
......
/*****************************************************************************
* VLCKit: TVVLCKit
*****************************************************************************
* Copyright (C) 2010-2013 Pierre d'Herbemont and VideoLAN
*
* Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
* Felix Paul Kühne <fkuehne # videolan.org
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import <TVVLCKit/VLCLibrary.h>
#import <TVVLCKit/VLCMedia.h>
#import <TVVLCKit/VLCMediaDiscoverer.h>
#import <TVVLCKit/VLCMediaList.h>
#import <TVVLCKit/VLCMediaPlayer.h>
#import <TVVLCKit/VLCMediaListPlayer.h>
#import <TVVLCKit/VLCMediaThumbnailer.h>
#import <TVVLCKit/VLCTime.h>
@class VLCMedia;
@class VLCMediaLibrary;
@class VLCMediaList;
@class VLCTime;
@class VLCVideoView;
@class VLCAudio;
@class VLCMediaThumbnailer;
@class VLCMediaListPlayer;
@class VLCMediaPlayer;
This diff is collapsed.
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