[vlc-commits] android/specific: move netconf.c to specific.c

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Jul 18 13:29:31 2016 +0200| [3a0ea4bf9670b2e46cecec24f021bf8a20a16d6d] | committer: Thomas Guillem

android/specific: move netconf.c to specific.c

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3a0ea4bf9670b2e46cecec24f021bf8a20a16d6d
---

 src/Makefile.am        |    3 +--
 src/android/netconf.c  |   55 ------------------------------------------------
 src/android/specific.c |   31 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 57 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index c0e2635..eea70ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -266,10 +266,9 @@ SOURCES_libvlc_android = \
 	android/thread.c \
 	android/error.c \
 	posix/filesystem.c \
-	android/netconf.c \
 	posix/plugin.c \
 	posix/timer.c \
-	android/specific.c \
+	android/specific.c  \
 	posix/rand.c \
 	$(NULL)
 
diff --git a/src/android/netconf.c b/src/android/netconf.c
deleted file mode 100644
index 1ec2025..0000000
--- a/src/android/netconf.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************
- * netconf.c : Network configuration
- *****************************************************************************
- *
- * 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.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_network.h>
-
-/* This is empty, of course
- *
- * The reason is that there is no simple way to get the proxy settings on all
- * supported versions of Android, even from the Java side...
- *
- * The best way would be to follow this "solution"
- * http://stackoverflow.com/questions/10811698/getting-wifi-proxy-settings-in-android/13616054#13616054
- *
- * Or, in summary, using JNI:
- * if( version >= 4.0 ) {
- *     System.getProperty( "http.proxyHost" );
- *     System.getProperty( "http.proxyPort" );
- * } else {
- *     context = magically_find_context();
- *     android.net.Proxy.getHost( context );
- *     android.net.Proxy.getPort( context );
- * }
- *
- * */
-
-/**
- * Determines the network proxy server to use (if any).
- * @param url absolute URL for which to get the proxy server
- * @return proxy URL, NULL if no proxy or error
- */
-char *vlc_getProxyUrl(const char *url)
-{
-    return NULL;
-}
diff --git a/src/android/specific.c b/src/android/specific.c
index 49955dc..26307a0 100644
--- a/src/android/specific.c
+++ b/src/android/specific.c
@@ -25,6 +25,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_network.h>
 #include <vlc_fs.h>
 #include "../libvlc.h"
 #include "config/configuration.h"
@@ -285,3 +286,33 @@ char *config_GetUserDir (vlc_userdir_t type)
     }
     return NULL;
 }
+
+/* This is empty, of course
+ *
+ * The reason is that there is no simple way to get the proxy settings on all
+ * supported versions of Android, even from the Java side...
+ *
+ * The best way would be to follow this "solution"
+ * http://stackoverflow.com/questions/10811698/getting-wifi-proxy-settings-in-android/13616054#13616054
+ *
+ * Or, in summary, using JNI:
+ * if( version >= 4.0 ) {
+ *     System.getProperty( "http.proxyHost" );
+ *     System.getProperty( "http.proxyPort" );
+ * } else {
+ *     context = magically_find_context();
+ *     android.net.Proxy.getHost( context );
+ *     android.net.Proxy.getPort( context );
+ * }
+ *
+ * */
+
+/**
+ * Determines the network proxy server to use (if any).
+ * @param url absolute URL for which to get the proxy server
+ * @return proxy URL, NULL if no proxy or error
+ */
+char *vlc_getProxyUrl(const char *url)
+{
+    return NULL;
+}