Permalink
Browse files

pvr: nuke libTcpSocket and libPlatform

  • Loading branch information...
1 parent f9131a2 commit 3c96a1b7021462a4ddb152392220e85122e315b9 Lars Op den Kamp committed Apr 1, 2012
View
@@ -26,7 +26,6 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
lib/libXDAAP/libxdaap.a \
lib/libhts/libhts.a \
lib/libsquish/libsquish.a \
- lib/libTcpSocket/libTcpSocket.a \
lib/tinyXML/tinyxml.a \
lib/xbmc-dll-symbols/dll-symbols.a \
xbmc/addons/addons.a \
@@ -101,7 +101,6 @@
DF7E680013ED4E25003ED690 /* DVDInputStreamPVRManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E67FC13ED4E25003ED690 /* DVDInputStreamPVRManager.cpp */; };
DF7E680113ED4E25003ED690 /* DVDInputStreamStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E67FE13ED4E25003ED690 /* DVDInputStreamStack.cpp */; };
DF7E680413ED4E42003ED690 /* DVDDemuxPVRClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E680213ED4E42003ED690 /* DVDDemuxPVRClient.cpp */; };
- DF7E680813ED4F15003ED690 /* libTcpSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF7E680713ED4F15003ED690 /* libTcpSocket.a */; };
DF7E681613ED5152003ED690 /* TimeSmoother.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF88787913E8912900B4ECE2 /* TimeSmoother.cpp */; };
DF7E683B13ED52B7003ED690 /* PVRDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E683713ED52B7003ED690 /* PVRDirectory.cpp */; };
DF7E683C13ED52B7003ED690 /* PVRFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E683913ED52B7003ED690 /* PVRFile.cpp */; };
@@ -1192,7 +1191,6 @@
DF7E67FF13ED4E25003ED690 /* DVDInputStreamStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDInputStreamStack.h; sourceTree = "<group>"; };
DF7E680213ED4E42003ED690 /* DVDDemuxPVRClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxPVRClient.cpp; sourceTree = "<group>"; };
DF7E680313ED4E42003ED690 /* DVDDemuxPVRClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDDemuxPVRClient.h; sourceTree = "<group>"; };
- DF7E680713ED4F15003ED690 /* libTcpSocket.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTcpSocket.a; path = lib/libTcpSocket/libTcpSocket.a; sourceTree = "<group>"; };
DF7E683713ED52B7003ED690 /* PVRDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRDirectory.cpp; sourceTree = "<group>"; };
DF7E683813ED52B7003ED690 /* PVRDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRDirectory.h; sourceTree = "<group>"; };
DF7E683913ED52B7003ED690 /* PVRFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRFile.cpp; sourceTree = "<group>"; };
@@ -3140,7 +3138,6 @@
F56B161B12CD69DB009B4C96 /* ImageIO.framework in Frameworks */,
4D5D2E131301753F006ABC13 /* CFNetwork.framework in Frameworks */,
18404DFD1396C44F00863BBA /* SlingboxLib.a in Frameworks */,
- DF7E680813ED4F15003ED690 /* libTcpSocket.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6199,7 +6196,6 @@
F589AE7012890B9E00D8079E /* libapetag.a */,
F589AE7D12890BEF00D8079E /* libsquish.a */,
F589AE7E12890BEF00D8079E /* librtv.a */,
- DF7E680713ED4F15003ED690 /* libTcpSocket.a */,
F589AE8012890BEF00D8079E /* libxdaap.a */,
18404DFC1396C44F00863BBA /* SlingboxLib.a */,
);
@@ -7400,7 +7396,6 @@
"\"$(SRCROOT)/xbmc/interfaces/json-rpc\"",
"\"$(SRCROOT)/xbmc/interfaces/http-api\"",
"\"$(SRCROOT)/xbmc/pvrclients/mythtv/libmythxml\"",
- "\"$(SRCROOT)/lib/libTcpSocket\"",
);
OTHER_LDFLAGS = (
"-Wl,-headerpad_max_install_names",
@@ -7499,7 +7494,6 @@
"\"$(SRCROOT)/xbmc/interfaces/json-rpc\"",
"\"$(SRCROOT)/xbmc/interfaces/http-api\"",
"\"$(SRCROOT)/xbmc/pvrclients/mythtv/libmythxml\"",
- "\"$(SRCROOT)/lib/libTcpSocket\"",
);
OTHER_LDFLAGS = (
"-Wl,-headerpad_max_install_names",
@@ -105,7 +105,6 @@
DF79146B13D4A0A20018E92E /* GUIEPGGridContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79146313D4A0A20018E92E /* GUIEPGGridContainer.cpp */; };
DF79147113D4A0E20018E92E /* Observer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79146F13D4A0E20018E92E /* Observer.cpp */; };
DF79147413D4A0F60018E92E /* TextSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79147213D4A0F60018E92E /* TextSearch.cpp */; };
- DF79147C13D4A30A0018E92E /* libTcpSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF79147B13D4A30A0018E92E /* libTcpSocket.a */; };
DFAC338A13EC693E0020DDC0 /* TimeSmoother.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF88796713E8997E00B4ECE2 /* TimeSmoother.cpp */; };
DFAC338B13EC69690020DDC0 /* DVDOverlayCodecTX3G.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8879A413E89AE000B4ECE2 /* DVDOverlayCodecTX3G.cpp */; };
DFAC338E13EC698D0020DDC0 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF88795E13E8997000B4ECE2 /* Implementation.cpp */; };
@@ -1211,7 +1210,6 @@
DF79147013D4A0E20018E92E /* Observer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Observer.h; sourceTree = "<group>"; };
DF79147213D4A0F60018E92E /* TextSearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextSearch.cpp; sourceTree = "<group>"; };
DF79147313D4A0F60018E92E /* TextSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextSearch.h; sourceTree = "<group>"; };
- DF79147B13D4A30A0018E92E /* libTcpSocket.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTcpSocket.a; path = lib/libTcpSocket/libTcpSocket.a; sourceTree = "<group>"; };
DF88795A13E8997000B4ECE2 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadLocal.h; path = platform/ThreadLocal.h; sourceTree = "<group>"; };
DF88795C13E8997000B4ECE2 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
DF88795D13E8997000B4ECE2 /* CriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CriticalSection.h; sourceTree = "<group>"; };
@@ -3186,7 +3184,6 @@
F56C8C12131F4811000AD0F6 /* librtv.a in Frameworks */,
F56C8C14131F4811000AD0F6 /* libxdaap.a in Frameworks */,
18404DD31396C3D200863BBA /* SlingboxLib.a in Frameworks */,
- DF79147C13D4A30A0018E92E /* libTcpSocket.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6226,7 +6223,6 @@
F589AE6D12890B6700D8079E /* Internal Libs */ = {
isa = PBXGroup;
children = (
- DF79147B13D4A30A0018E92E /* libTcpSocket.a */,
F56C8C03131F47EA000AD0F6 /* libapetag.a */,
F56C8C0D131F4811000AD0F6 /* libsquish.a */,
F56C8C0E131F4811000AD0F6 /* librtv.a */,
@@ -7437,7 +7433,6 @@
"\"$(SRCROOT)/lib/SlingboxLib\"",
"\"$(SRCROOT)/xbmc/interfaces/http-api\"",
"\"$(SRCROOT)/xbmc/interfaces/json-rpc\"",
- "\"$(SRCROOT)/lib/libTcpSocket\"",
);
OTHER_LDFLAGS = (
"-Wl,-headerpad_max_install_names",
@@ -7531,7 +7526,6 @@
"\"$(SRCROOT)/lib/cmyth/librefmem\"",
"\"$(SRCROOT)/lib/libapetag/.libs\"",
"\"$(SRCROOT)/lib/libsquish\"",
- "\"$(SRCROOT)/lib/libTcpSocket\"",
"\"$(SRCROOT)/lib/SlingboxLib\"",
"\"$(SRCROOT)/xbmc/interfaces/http-api\"",
"\"$(SRCROOT)/xbmc/interfaces/json-rpc\"",
@@ -677,8 +677,6 @@
C8EC5D0E1369519D00CCC10D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D0C1369519D00CCC10D /* XBMC_keytable.cpp */; };
DF0DF15B13A3ADA7008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF15713A3ADA7008ED511 /* FileNFS.cpp */; };
DF0DF15C13A3ADA7008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */; };
- DF79158113D4A6940018E92E /* libTcpSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF79158013D4A6940018E92E /* libTcpSocket.a */; };
- DF79158213D4A6940018E92E /* libTcpSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF79158013D4A6940018E92E /* libTcpSocket.a */; };
DF79158B13D4A6BC0018E92E /* AddonCallbacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79158313D4A6BC0018E92E /* AddonCallbacks.cpp */; };
DF79158C13D4A6BC0018E92E /* AddonCallbacksAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79158513D4A6BC0018E92E /* AddonCallbacksAddon.cpp */; };
DF79158D13D4A6BC0018E92E /* AddonCallbacksGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79158713D4A6BC0018E92E /* AddonCallbacksGUI.cpp */; };
@@ -2759,7 +2757,6 @@
DF0DF15813A3ADA7008ED511 /* FileNFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileNFS.h; sourceTree = "<group>"; };
DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
DF0DF15A13A3ADA7008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
- DF79158013D4A6940018E92E /* libTcpSocket.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTcpSocket.a; path = lib/libTcpSocket/libTcpSocket.a; sourceTree = "<group>"; };
DF79158313D4A6BC0018E92E /* AddonCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacks.cpp; sourceTree = "<group>"; };
DF79158413D4A6BC0018E92E /* AddonCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacks.h; sourceTree = "<group>"; };
DF79158513D4A6BC0018E92E /* AddonCallbacksAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacksAddon.cpp; sourceTree = "<group>"; };
@@ -4198,7 +4195,7 @@
F56C8CF3131F5DFD000AD0F6 /* libiconv.dylib in Frameworks */,
F56C8CF6131F5E0B000AD0F6 /* libncurses.dylib in Frameworks */,
18404DA61396C31B00863BBA /* SlingboxLib.a in Frameworks */,
- DF79158113D4A6940018E92E /* libTcpSocket.a in Frameworks */,
+ DFC1B8F01464840E00B1BE79 /* SystemConfiguration.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4233,7 +4230,7 @@
F5B5D64E133FC2E7007A4B4C /* librtv.a in Frameworks */,
F5B5D650133FC312007A4B4C /* libxdaap.a in Frameworks */,
18404E711396E06C00863BBA /* SlingboxLib.a in Frameworks */,
- DF79158213D4A6940018E92E /* libTcpSocket.a in Frameworks */,
+ DFC1BA3414648D6500B1BE79 /* SystemConfiguration.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7412,7 +7409,6 @@
F57E1ED20E36E8FD00700C9D /* internal libs */ = {
isa = PBXGroup;
children = (
- DF79158013D4A6940018E92E /* libTcpSocket.a */,
F5DC888A110A654000EE1B15 /* libapetag.a */,
43352CED1071634600706B8A /* libsquish.a */,
E38E256C0D263A1C00618676 /* librtv.a */,
@@ -9726,7 +9722,6 @@
"$(SRCROOT)/lib/SlingboxLib",
"$(SRCROOT)/xbmc/interfaces/http-api",
"$(SRCROOT)/xbmc/interfaces/json-rpc",
- "\"$(SRCROOT)/lib/libTcpSocket\"",
);
LINK_WITH_STANDARD_LIBRARIES = YES;
OTHER_LDFLAGS = (
@@ -9826,7 +9821,6 @@
"$(SRCROOT)/lib/SlingboxLib",
"$(SRCROOT)/xbmc/interfaces/http-api",
"$(SRCROOT)/xbmc/interfaces/json-rpc",
- "\"$(SRCROOT)/lib/libTcpSocket\"",
);
LINK_WITH_STANDARD_LIBRARIES = YES;
OTHER_LDFLAGS = (
@@ -9985,7 +9979,6 @@
"$(SRCROOT)/xbmc/interfaces/http-api",
"$(SRCROOT)/xbmc/interfaces/json-rpc",
"$(SRCROOT)/lib/SlingboxLib",
- "\"$(SRCROOT)/lib/libTcpSocket\"",
);
LINK_WITH_STANDARD_LIBRARIES = YES;
OTHER_LDFLAGS = (
@@ -10086,7 +10079,6 @@
"$(SRCROOT)/xbmc/interfaces/http-api",
"$(SRCROOT)/xbmc/interfaces/json-rpc",
"$(SRCROOT)/lib/SlingboxLib",
- "\"$(SRCROOT)/lib/libTcpSocket\"",
);
LINK_WITH_STANDARD_LIBRARIES = YES;
OTHER_LDFLAGS = (
@@ -1,59 +0,0 @@
-#pragma once
-/*
- * Copyright (C) 2005-2011 Team XBMC
- * http://www.xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#define _FILE_OFFSET_BITS 64
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/timeb.h>
-#include <sys/resource.h>
-#include <sys/syscall.h>
-#ifndef __APPLE__
-#include <sys/prctl.h>
-#endif
-#include <pthread.h>
-#include <poll.h>
-#include <semaphore.h>
-
-#define LIBTYPE
-
-#ifndef __STL_CONFIG_H
-template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
-template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
-template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
-template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
-#endif
-
-/*!
- * @return the current time in seconds since unix epoch.
- */
-static inline uint64_t getcurrenttime(void)
-{
- struct timeval t;
- gettimeofday(&t, NULL);
- return ((uint64_t)t.tv_sec * 1000) + (t.tv_usec / 1000);
-}
@@ -1,39 +0,0 @@
-#pragma once
-/*
- * Copyright (C) 2005-2011 Team XBMC
- * http://www.xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#if defined(_WIN32) || defined(_WIN64)
-#ifndef __WINDOWS__
-#define __WINDOWS__
-#endif
-#endif
-
-#if defined(__WINDOWS__)
-#include "windows/os_windows.h"
-#else
-#include "linux/os_posix.h"
-#endif
-
-#if !defined(TRUE)
-#define TRUE 1
-#endif
-
-#if !defined(FALSE)
-#define FALSE 0
-#endif
Oops, something went wrong.

0 comments on commit 3c96a1b

Please sign in to comment.