Permalink
Browse files

Merge pull request #55 from jdembski/add_vuplus

[vuplus]: Add Vu+ addon 0.3.2
  • Loading branch information...
2 parents 4904df3 + df8847b commit 95dc07cba7cbe66c777a1debf397f79dfa33f8ee @opdenkamp committed Oct 9, 2012
View
@@ -2,7 +2,8 @@ SUBDIRS = pvr.demo \
pvr.hts \
pvr.mediaportal.tvserver \
pvr.vdr.vnsi \
- pvr.njoy
+ pvr.njoy \
+ pvr.vuplus
clean:
-rm -f *.zip
@@ -0,0 +1,19 @@
+#
+# Makefile for the VuPlus add-on for XBMC PVR
+#
+# See the README for copyright information and
+# how to reach the author.
+#
+
+ADDONBINNAME = XBMC_vuplus
+ADDONNAME = pvr.vuplus
+LIBNAME = libvuplus-addon
+lib_LTLIBRARIES = libvuplus-addon.la
+
+LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+
+include ../Makefile.include.am
+
+libvuplus_addon_la_SOURCES = src/client.cpp \
+ src/VuData.cpp
+
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon
+ id="pvr.vuplus"
+ version="0.3.2"
+ name="VU+ / Enigma2 Client"
+ provider-name="Joerg Dembski">
+ <requires>
+ <c-pluff version="0.1"/>
+ </requires>
+ <extension
+ point="xbmc.pvrclient"
+ library_linux="XBMC_vuplus.pvr"
+ library_osx="XBMC_vuplus.pvr"
+ library_wingl="XBMC_vuplus_win32.pvr"
+ library_windx="XBMC_vuplus_win32.pvr"/>
+ <extension point="xbmc.addon.metadata">
+ <summary>XBMC's frontend for VU+ / Enigma2 based settop boxes</summary>
+ <description>VU+ frontend; supporting streaming of Live TV &amp; Recordings, EPG, Timers.</description>
+ <disclaimer>This is unstable software! The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects..</disclaimer>
+ <platform>all</platform>
+ </extension>
+</addon>
@@ -0,0 +1,107 @@
+0.3.2:
+- fix: continue to load channels even if we do not have any radio channels
+
+0.3.1:
+- change: remove XMLParser
+- change: add enigma2 to the displayname
+
+0.3.0:
+- change: remove curl dependancy
+- change: adjust to new PVR API
+
+0.2.8:
+- add: option to only fetch one TV bouquet which can be specified via the addon settings
+
+0.2.7:
+- fix: fix incorrect escape character for & (use '&amp;' instead of '&quot;'). Thx to 'hani' for pointing this out.
+
+0.2.6:
+- cosmetic: remove unnecessary '/' in recording-stream url
+- cosmetic: inprove log output
+- change: get the proper device info from the reveiver box instead of just setting dummy values
+- change: change the buildzip.bat to include version string in the name of the zip-file
+- change: introduce a version string for the channeldata xml file so that we can invalidate old channeldata files if necessary
+
+0.2.5:
+- fix: cleanup the service reference in the streaming url
+
+0.2.4
+- fix: put username & password into the streaming url
+
+0.2.3
+- fix: put username & password into recording-url
+
+0.2.2:
+- fix: escape xml entities in the stream-url before saving to channeldata.xml
+- fix: fetch the version string from configure.in not the ChangeLog (thanks to 'trans')
+- fix: rename changelog in addon-directory to changelog.txt
+
+0.2.1:
+- fix: encode the stream-url properly. Please remove your channeldata.xml file after updating
+- change: add proper version string to the addon.xml generated by buildzip.bat (thanks to 'trans')
+
+0.2.0:
+- change: Complete rework of timer handling. Now it will only show notifications for changed items
+- fix: Update / Add / Delete Timers. Note that the timer names in the XBMC are sometimes not updated properly (in the dialog it is OK)
+- fix: Instant Recordings do now work again
+- fix: timer status is now shown correctly (completed, recording, disabled)
+- fix: enabling / disabling timers do now work
+- change: removed "show completed timers" option (they are now always be shown)
+- add: added buildzip.bat & xbmc-addon-vuplus.sln (thanks to 'trans')
+- fix: Channel numbering / incorrect picons due to the change introduced in 0.1.15
+
+0.1.15
+- fix: when using the channeldata-store option not all channel groups (bouquets) were loaded due to a nulled counter variable
+
+0.1.14
+- change: change .gitignores and copy current changelog into the addon folder. This will enable the user to view the changelog in the addon settings window
+
+0.1.13
+- add: option to set deepstandby powerstate on the DVB box on PVR-addon shutdown
+- fix: error in settings.xml, causing crashes on linux
+
+0.1.12
+- add: support to specify the folder for storing recordings
+
+0.1.11
+- fix: some unicode string errors in german language file
+- change: add categories to addon settings
+
+0.1.10
+- add: support for using only the recording path currently active on the DVB box
+
+0.1.9
+- change: add addon icon (copyied from the openelec guys, thanks!)
+- fix: win32 release target (thanks to 'trans' for patch)
+
+0.1.8
+- change: fetch the recording locations and use these locations when querying the recordings
+- fix: Stop update thread when destroying the PVR addon - fixes shutdown issues
+
+0.1.7
+- fix: Copy & Paste error
+
+0.1.6
+- fix: Change the logic to determine the picon file name from the service reference.
+
+0.1.5
+- fix: Fix access violation errors on windows (thanks to 'trans' for finding the correct compiler / linker settings)
+- fix: do not return out of scope local variable for the streaming URL
+- fix: remove the last '_' character from the filename (if applicable). Should finally fix the picon path errors.
+
+0.1.4
+- fix: limit length of the service reference part of the Icon-Path to 30 characters.
+- fix: Escape "&", "<" and ">" characters in XML channeldata file.
+- add: support to disable all bouquet or channel updates
+
+0.1.3
+- fix: order of timerlist cleanup and timerlist updates
+
+0.1.2
+- add: support for storing channel data into a file
+
+0.1.1
+- fix: URLEncode the service reference when fetching EPG
+
+0.1.0
+- Iniital Version
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <!-- settings labels -->
+ <string id="30000">VU+ hostname or IP address</string>
+ <string id="30002">Streaming Port</string>
+ <string id="30003">Username</string>
+ <string id="30004">Password</string>
+ <string id="30007">Response timeout in seconds</string>
+ <string id="30008">Icon Path</string>
+ <string id="30010">Update Interval in minutes</string>
+ <string id="30011">Automatic Timerlist Cleanup</string>
+ <string id="30012">Webinterface Port</string>
+ <string id="30013">Zap before channelswitch (i.e. for Single Tuner boxes)</string>
+ <string id="30014">Folder for channeldata</string>
+ <string id="30015">Check for bouquett updates</string>
+ <string id="30016">Check for channel updates</string>
+ <string id="30017">Use only the DVB boxes' current recording path</string>
+ <string id="30018">General</string>
+ <string id="30019">Channels</string>
+ <string id="30020">Advanced</string>
+ <string id="30021">HTTP</string>
+ <string id="30022">Recordings / Timer</string>
+ <string id="30022">Recording path on DVB box</string>
+ <string id="30023">Recording folder on the receiver</string>
+ <string id="30024">Send DeepStandby-Command</string>
+ <string id="30025">Fetch only one TV bouquet</string>
+ <string id="30026">TV-Bouquet</string>
+
+ <!-- notifications -->
+ <string id="30500">Disconnected from '%s'</string>
+ <string id="30501">Reconnected to '%s'</string>
+</strings>
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <!-- settings labels -->
+ <string id="30000">VU+ IP</string>
+ <string id="30002">Streaming Port</string>
+ <string id="30003">Benutzername</string>
+ <string id="30004">Passwort</string>
+ <string id="30007">Antwort-Timeout in Sekunden</string>
+ <string id="30008">Picon-Pfad</string>
+ <string id="30010">Aktualisierungsintervall (in Minuten)</string>
+ <string id="30011">Entferne abgeschlossene Timer</string>
+ <string id="30012">Webinterface Port</string>
+ <string id="30013">Umschalten auf Receiver (z.B. bei SingleTuner Receivern)</string>
+ <string id="30014">Speicherort für Kanaldaten</string>
+ <string id="30015">Überprüfe auf Bouquettaktualisierungen</string>
+ <string id="30016">Überprüfe auf Kanalaktualisierungen</string>
+ <string id="30017">Aktuellen Box-Aufnahmenpfad nutzen</string>
+ <string id="30018">Allgemeines</string>
+ <string id="30019">Sender</string>
+ <string id="30020">Fortgeschritten</string>
+ <string id="30021">HTTP</string>
+ <string id="30022">Aufnahmen / Timer</string>
+ <string id="30023">Aufnahmeverzeichnis auf dem Receiver</string>
+ <string id="30024">Sende DeepStandby-Befehl</string>
+ <string id="30025">Nur ein TV-Bouquet</string>
+ <string id="30026">TV-Bouquet</string>
+
+ <!-- notifications -->
+ <string id="30500">Verbindung '%s' unterbrochen</string>
+ <string id="30501">Verbindung zu '%s' wiederhergestellt</string>
+</strings>
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+ <!-- SYSTEM -->
+ <category label="30018">
+ <setting id="host" type="text" label="30000" default="127.0.0.1" />
+ <setting id="iconpath" type="folder" label="30008" default="" />
+ <setting id="updateint" type="number" label="30010" default="2" />
+ </category>
+
+ <!-- Channels -->
+ <category label="30019">
+ <setting id="channeldatapath" type="folder" label="30014" default="" />
+ <setting label="30025" type="bool" id="onlyonegroup" default="false"/>
+ <setting label="30026" type="text" id="onegroup" default="" enable="eq(-1,true)" />
+ <setting label="30015" type="bool" id="checkgroups" default="true"/>
+ <setting label="30016" type="bool" id="checkchannels" default="true"/>
+ <setting label="30013" type="bool" id="zap" default="false"/>
+ </category>
+
+ <!-- Advanced -->
+ <category label="30020">
+ <setting id="streamport" type="number" label="30002" default="8001" />
+ <setting id="webport" type="number" label="30012" default="80" />
+ <setting id="user" type="text" label="30003" default="" />
+ <setting id="pass" type="text" label="30004" option="hidden" default="" />
+ <setting id="recordingpath" type="text" label="30023" default="" />
+ <setting label="30017" type="bool" id="onlycurrent" default="false"/>
+ <setting label="30011" type="bool" id="timerlistcleanup" default="false"/>
+ <setting label="30024" type="bool" id="setpowerstate" default="false" />
+ </category>
+</settings>
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{848DCDD6-7142-4507-A75A-6872A9256F3F}</ProjectGuid>
+ <RootNamespace>pvrvuplus</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>..\..\addon\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <TargetExt>.pvr</TargetExt>
+ <TargetName>XBMC_vuplus_win32</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>..\..\addon\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <TargetExt>.pvr</TargetExt>
+ <TargetName>XBMC_vuplus_win32</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalIncludeDirectories>..\..\..\..\xbmc;..\..\..\..\lib;..\..\..\..\lib\platform\windows;..\..\..\..\project\BuildDependencies\include</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_WINDLL;TARGET_WINDOWS;_WINSOCKAPI_;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalLibraryDirectories>..\..\..\..\project\BuildDependencies\lib</AdditionalLibraryDirectories>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalIncludeDirectories>..\..\..\..\xbmc;..\..\..\..\lib;..\..\..\..\lib\platform\windows;..\..\..\..\project\BuildDependencies\include</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_WINDLL;TARGET_WINDOWS;_WINSOCKAPI_;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalLibraryDirectories>..\..\..\..\project\BuildDependencies\lib</AdditionalLibraryDirectories>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\src\client.cpp" />
+ <ClCompile Include="..\..\src\VuData.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\src\client.h" />
+ <ClInclude Include="..\..\src\VuData.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\project\VS2010Express\platform\platform.vcxproj">
+ <Project>{fe4573f6-a794-4ad3-b37f-49e51f1140e6}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\project\VS2010Express\tinyxml\tinyxml.vcxproj">
+ <Project>{bdc7d21d-9fd9-41aa-bec8-8b70e1448c50}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\src\client.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\VuData.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\src\client.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\VuData.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
Oops, something went wrong.

0 comments on commit 95dc07c

Please sign in to comment.