Bump version to 0.3.7

Signed-off-by: Julian Scheel <julian@jusst.de>

.travis.yml

@@ -36,7 +36,7 @@ before_install:
 #
 before_script:
   - 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
   - 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

README.md

@@ -1,5 +1,5 @@
 # Octonet PVR
-Digital Devices [Octonet] (http://www.digital-devices.eu/shop/de/netzwerk-tv/) PVR client addon for [Kodi] (http://kodi.tv)
+Digital Devices [Octonet](http://www.digital-devices.eu/shop/de/netzwerk-tv/) PVR client addon for [Kodi](http://kodi.tv)
 
 | Platform | Status |
 |----------|--------|
@@ -8,25 +8,33 @@ Digital Devices [Octonet] (http://www.digital-devices.eu/shop/de/netzwerk-tv/) P
 
 # Building
 
-## Windows
+These instructions work on all supported platforms for the most part. Obviously, paths need to be
-1. Create a file `project/cmake/addons/addons/kodi.pvr.octonet/kodi.pvr.octonet.txt` containing a
+adjusted according to your OS (`/` vs `\`). We use Linux paths here as an example.
-   single line `kodi.pvr.octonet file://C:\some\path`. The path doesn't matter and doesn't need to
-   actually exist.
 
-2. Use a shell that has environment variables setup by Visual Studio for the native x86 toolchain.
+Clone the `pvr.octonet` repository:
-   Run the following in a new build directory and adjust paths accordingly:
 
 ```
-cmake -G "NMake Makefiles" ^
+$ git clone https://github.com/DigitalDevices/pvr.octonet.git
-    -DCMAKE_BUILD_TYPE=Release ^
-    -DADDONS_TO_BUILD="kodi.pvr.octonet" ^
-    -DADDON_SRC_PREFIX="path_to_where_kodi.pvr.octonet_is" ^
-    -DCMAKE_INSTALL_PREFIX="some_subdirectory" ^
-    -DPACKAGE_ZIP=ON ^
-    "path_to_kodi\project\cmake\addons"
 ```
 
-Make sure `ADDON_SRC_PREFIX` points to the parent directory of `kodi.pvr.octonet`.
+Clone the Kodi repository:
 
-4. Build the addon by running `nmake`. Run `nmake package-addons` to package a zip file of the
+```
-   addon.
+$ git clone https://github.com/xbmc/xbmc.git
+```
+
+If you already have a local Kodi checkout, you can use that one. Just make sure it is recent enough
+(Kodi 17 Beta 5 or later should work).
+
+```
+$ cd pvr.octonet
+$ mkdir build
+$ cd build
+$ cmake -DCMAKE_BUILD_TYPE=Release -DADDONS_TO_BUILD="pvr.octonet" -DADDON_SRC_PREFIX="path to parent of pvr.octonet" -DCMAKE_INSTALL_PREFIX="install" -DPACKAGE_ZIP=ON "path to kodi/project/cmake/addons"
+```
+
+On Windows, you should add `-G "NMake Makefiles"` to the CMake invocation. Make sure that
+`ADDON_SRC_PREFIX` does _not_ point directly to `pvr.octonet` but instead to its parent directory.
+
+Finally, build the plugin with `make` (or `nmake` on Windows). The plugin should be in an `install`
+subdirectory.

appveyor.yml

@@ -21,15 +21,20 @@ environment:
     - GENERATOR: "Visual Studio 14"
       CONFIG: Release
 
+artifacts:
+  - path: build/install/
+    name: pvr.octonet
+    type: zip
+
 build_script:
   - 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
   - echo pvr.octonet https://github.com/DigitalDevices/pvr.octonet master > xbmc\project\cmake\addons\addons\pvr.octonet\pvr.octonet.txt
   - cd %ADDON%
   - mkdir build
   - cd build
   # 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%

pvr.octonet/addon.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
 	id="pvr.octonet"
-	version="0.3.2"
+	version="0.3.7"
 	name="Digital Devices Octopus NET Client"
 	provider-name="digitaldevices">
 	<requires>
 		<c-pluff version="0.1" />
-		<import addon="xbmc.pvr" version="5.2.0" />
+		<import addon="xbmc.pvr" version="5.2.1" />
 	</requires>
 	<extension
 		point="xbmc.pvrclient"

src/OctonetData.cpp

@@ -53,14 +53,8 @@ OctonetData::~OctonetData(void)
 
 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;
 }

src/client.cpp

@@ -302,7 +302,7 @@ bool CanSeekStream() { return false; }
 
 /* Callbacks */
 void PauseStream(bool bPaused) {}
-bool SeekTime(int time, bool backwards, double *startpts) { return false; }
+bool SeekTime(double time, bool backwards, double *startpts) { return false; }
 void SetSpeed(int speed) {}
 PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; }