Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to libp8-platform #40

Merged
merged 2 commits into from
Jan 23, 2016
Merged

Update to libp8-platform #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0aa177a
[src] Update to p8-platform
hudokkow Jan 6, 2016
d42dbc4
[cmake] Update to p8-platform
hudokkow Jan 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ enable_language(CXX)

find_package(kodi REQUIRED)
find_package(kodiplatform REQUIRED)
find_package(platform REQUIRED)
find_package(p8-platform REQUIRED)
find_package(TinyXML REQUIRED)
find_package(JsonCpp REQUIRED)

include_directories(${kodiplatform_INCLUDE_DIRS}
${platform_INCLUDE_DIRS}
${p8-platform_INCLUDE_DIRS}
${KODI_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/lib
${TINYXML_INCLUDE_DIRS}
${JSONCPP_INCLUDE_DIRS})

add_subdirectory(lib/libstalkerclient)

set(DEPLIBS ${platform_LIBRARIES} stalkerclient ${TINYXML_LIBRARIES} ${JSONCPP_LIBRARIES})
set(DEPLIBS ${p8-platform_LIBRARIES} stalkerclient ${TINYXML_LIBRARIES} ${JSONCPP_LIBRARIES})

if(WIN32)
list(APPEND DEPLIBS ws2_32)
Expand Down
4 changes: 2 additions & 2 deletions src/CWatchdog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
*
*/

#include "platform/threads/threads.h"
#include "p8-platform/threads/threads.h"

#include "libstalkerclient/identity.h"

class CWatchdog : public PLATFORM::CThread
class CWatchdog : public P8PLATFORM::CThread
{
public:
CWatchdog(uint32_t iInterval, sc_identity_t &m_identity);
Expand Down
6 changes: 3 additions & 3 deletions src/HTTPSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@

#include <algorithm>

#include "platform/util/StringUtils.h"
#include "platform/sockets/tcp.h"
#include "p8-platform/util/StringUtils.h"
#include "p8-platform/sockets/tcp.h"

#include "client.h"
#include "Utils.h"

#define TEMP_BUFFER_SIZE 1024

using namespace ADDON;
using namespace PLATFORM;
using namespace P8PLATFORM;

HTTPSocket::HTTPSocket(uint32_t iTimeout)
: m_iTimeout(iTimeout)
Expand Down
4 changes: 2 additions & 2 deletions src/HTTPSocket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class HTTPSocket
std::vector<UrlOption> m_defaultOptions;
};

namespace PLATFORM
namespace P8PLATFORM
{
class CTcpConnection;
}
Expand All @@ -105,5 +105,5 @@ class HTTPSocketRaw : public HTTPSocket
private:
std::string m_host;
int m_port;
PLATFORM::CTcpConnection *m_socket;
P8PLATFORM::CTcpConnection *m_socket;
};
2 changes: 1 addition & 1 deletion src/SAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <algorithm>
#include <sstream>

#include "platform/os.h"
#include "p8-platform/os.h"

#include "libstalkerclient/itv.h"
#include "libstalkerclient/param.h"
Expand Down
8 changes: 4 additions & 4 deletions src/SData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
#include <cmath>

#include "tinyxml.h"
#include "platform/util/StringUtils.h"
#include "platform/util/timeutils.h"
#include "platform/util/util.h"
#include "p8-platform/util/StringUtils.h"
#include "p8-platform/util/timeutils.h"
#include "p8-platform/util/util.h"

#include "libstalkerclient/itv.h"
#include "libstalkerclient/util.h"
Expand All @@ -46,7 +46,7 @@
#define MSG_RE_AUTHENTICATED 30510

using namespace ADDON;
using namespace PLATFORM;
using namespace P8PLATFORM;

SData::SData(void)
{
Expand Down
4 changes: 2 additions & 2 deletions src/SData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@ class SData
time_t m_iNextEpgLoadTime;

sc_identity_t m_identity;
PLATFORM::CMutex m_authMutex;
P8PLATFORM::CMutex m_authMutex;
sc_stb_profile_t m_profile;
Json::Value m_epgData;
std::vector<SChannelGroup> m_channelGroups;
std::vector<SChannel> m_channels;
std::string m_PlaybackURL;
CWatchdog *m_watchdog;
XMLTV *m_xmltv;
PLATFORM::CMutex m_epgMutex;
P8PLATFORM::CMutex m_epgMutex;
};
2 changes: 1 addition & 1 deletion src/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <iterator>
#include <sstream>

#include "platform/os.h"
#include "p8-platform/os.h"

#include "client.h"

Expand Down
2 changes: 1 addition & 1 deletion src/XMLTV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <string>
#include <vector>

#include "platform/util/StringUtils.h"
#include "p8-platform/util/StringUtils.h"

#include "client.h"
#include "Utils.h"
Expand Down
2 changes: 1 addition & 1 deletion src/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include "kodi/xbmc_pvr_dll.h"
#include "kodi/libKODI_guilib.h"
#include "platform/util/util.h"
#include "p8-platform/util/util.h"

#include "SData.h"

Expand Down