mirror of
https://github.com/DigitalDevices/pvr.octonet.git
synced 2025-03-01 10:53:09 +00:00
Compare commits
5 Commits
1.1.0-1-Ma
...
Krypton
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4077a142c | ||
|
|
6ee28476fa | ||
|
|
de0a0f9a81 | ||
|
|
1b0c31654a | ||
|
|
f260cb07e9 |
@@ -36,7 +36,7 @@ before_install:
|
|||||||
#
|
#
|
||||||
before_script:
|
before_script:
|
||||||
- cd $TRAVIS_BUILD_DIR/..
|
- cd $TRAVIS_BUILD_DIR/..
|
||||||
- git clone --depth=1 https://github.com/xbmc/xbmc.git
|
- git clone --depth=1 https://github.com/xbmc/xbmc.git -b Krypton
|
||||||
- mkdir -p xbmc/project/cmake/addons/addons/pvr.octonet
|
- mkdir -p xbmc/project/cmake/addons/addons/pvr.octonet
|
||||||
- echo "pvr.octonet https://github.com/DigitalDevices/pvr.octonet master" > xbmc/project/cmake/addons/addons/pvr.octonet/pvr.octonet.txt
|
- echo "pvr.octonet https://github.com/DigitalDevices/pvr.octonet master" > xbmc/project/cmake/addons/addons/pvr.octonet/pvr.octonet.txt
|
||||||
- cd $TRAVIS_BUILD_DIR && mkdir build && cd build
|
- cd $TRAVIS_BUILD_DIR && mkdir build && cd build
|
||||||
|
|||||||
@@ -21,15 +21,20 @@ environment:
|
|||||||
- GENERATOR: "Visual Studio 14"
|
- GENERATOR: "Visual Studio 14"
|
||||||
CONFIG: Release
|
CONFIG: Release
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
- path: build/install/
|
||||||
|
name: pvr.octonet
|
||||||
|
type: zip
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- cd ..
|
- cd ..
|
||||||
- set ROOT=%cd%
|
- set ROOT=%cd%
|
||||||
- git clone --depth=1 https://github.com/xbmc/xbmc.git
|
- git clone --depth=1 https://github.com/xbmc/xbmc.git -b Krypton
|
||||||
- mkdir xbmc\project\cmake\addons\addons\pvr.octonet
|
- mkdir xbmc\project\cmake\addons\addons\pvr.octonet
|
||||||
- echo pvr.octonet https://github.com/DigitalDevices/pvr.octonet master > xbmc\project\cmake\addons\addons\pvr.octonet\pvr.octonet.txt
|
- echo pvr.octonet https://github.com/DigitalDevices/pvr.octonet master > xbmc\project\cmake\addons\addons\pvr.octonet\pvr.octonet.txt
|
||||||
- cd %ADDON%
|
- cd %ADDON%
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
# Must use absolute path for cmake to build depends correctly
|
# Must use absolute path for cmake to build depends correctly
|
||||||
- cmake -G "%GENERATOR%" -DADDONS_TO_BUILD=%ADDON% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDON_SRC_PREFIX=%ROOT% -DCMAKE_INSTALL_PREFIX=%ROOT%\xbmc\addons -DPACKAGE_ZIP=1 %ROOT%\xbmc\project\cmake\addons
|
- cmake -G "%GENERATOR%" -DADDONS_TO_BUILD=%ADDON% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDON_SRC_PREFIX=%ROOT% -DCMAKE_INSTALL_PREFIX=install -DPACKAGE_ZIP=1 %ROOT%\xbmc\project\cmake\addons
|
||||||
- cmake --build . --config %CONFIG%
|
- cmake --build . --config %CONFIG%
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<addon
|
<addon
|
||||||
id="pvr.octonet"
|
id="pvr.octonet"
|
||||||
version="0.3.6"
|
version="0.3.7"
|
||||||
name="Digital Devices Octopus NET Client"
|
name="Digital Devices Octopus NET Client"
|
||||||
provider-name="digitaldevices">
|
provider-name="digitaldevices">
|
||||||
<requires>
|
<requires>
|
||||||
|
|||||||
@@ -53,14 +53,8 @@ OctonetData::~OctonetData(void)
|
|||||||
|
|
||||||
int64_t OctonetData::parseID(std::string id)
|
int64_t OctonetData::parseID(std::string id)
|
||||||
{
|
{
|
||||||
int64_t nativeId;
|
std::hash<std::string> hash_fn;
|
||||||
size_t strip;
|
int64_t nativeId = hash_fn(id);
|
||||||
/* Strip colons from id */
|
|
||||||
while ((strip = id.find(":")) != std::string::npos)
|
|
||||||
id.erase(strip, 1);
|
|
||||||
|
|
||||||
std::stringstream ids(id);
|
|
||||||
ids >> nativeId;
|
|
||||||
|
|
||||||
return nativeId;
|
return nativeId;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user