Permalink
Browse files

Merge pull request #243 from FernetMenta/vnsi5

Vnsi5
  • Loading branch information...
2 parents 9ac2aaf + a38c3a6 commit e2e6804d3f442c8e1996e78fdfc49066b9e6e114 @opdenkamp committed Dec 11, 2013
Showing with 2,293 additions and 354 deletions.
  1. +1 −0 addons/pvr.vdr.vnsi/Makefile.am
  2. +1 −1 addons/pvr.vdr.vnsi/addon/addon.xml.in
  3. +29 −1 addons/pvr.vdr.vnsi/addon/resources/language/English/strings.po
  4. +283 −80 addons/pvr.vdr.vnsi/addon/resources/skins/skin.aeon.nox/1080i/Admin.xml
  5. +388 −168 addons/pvr.vdr.vnsi/addon/resources/skins/skin.confluence/720p/Admin.xml
  6. +376 −3 addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp
  7. +14 −0 addons/pvr.vdr.vnsi/src/VNSIAdmin.h
  8. +195 −0 addons/pvr.vdr.vnsi/src/VNSIChannels.cpp
  9. +73 −0 addons/pvr.vdr.vnsi/src/VNSIChannels.h
  10. +44 −3 addons/pvr.vdr.vnsi/src/VNSIData.cpp
  11. +1 −0 addons/pvr.vdr.vnsi/src/VNSIData.h
  12. +31 −0 addons/pvr.vdr.vnsi/src/VNSIDemux.cpp
  13. +8 −0 addons/pvr.vdr.vnsi/src/VNSIDemux.h
  14. +34 −4 addons/pvr.vdr.vnsi/src/client.cpp
  15. +8 −1 addons/pvr.vdr.vnsi/src/vnsicommand.h
  16. +9 −0 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/HISTORY
  17. +2 −2 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
  18. +332 −0 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/channelfilter.c
  19. +55 −0 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/channelfilter.h
  20. +32 −6 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer.c
  21. +4 −2 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/demuxer.h
  22. +13 −8 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser.c
  23. +1 −0 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser.h
  24. +11 −5 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGVideo.c
  25. +1 −0 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_MPEGVideo.h
  26. +14 −5 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/parser_h264.c
  27. +30 −5 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/streamer.c
  28. +1 −0 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/streamer.h
  29. +46 −10 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videobuffer.c
  30. +5 −2 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/videobuffer.h
  31. +1 −1 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsi.h
  32. +223 −32 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiclient.c
  33. +6 −0 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiclient.h
  34. +8 −1 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsicommand.h
  35. +13 −14 addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiserver.c
@@ -19,6 +19,7 @@ libvdrvnsi_addon_la_SOURCES = src/client.cpp \
src/VNSIRecording.cpp \
src/VNSISession.cpp \
src/VNSIAdmin.cpp \
+ src/VNSIChannels.cpp \
src/requestpacket.cpp \
src/responsepacket.cpp \
src/tools.cpp
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.vdr.vnsi"
- version="1.9.4"
+ version="1.9.5"
name="VDR VNSI Client"
provider-name="FernetMenta, Team XBMC">
<requires>
@@ -241,4 +241,32 @@ msgstr ""
msgctxt "#30107"
msgid "VDR Admin"
-msgstr ""
+msgstr ""
+
+msgctxt "#30108"
+msgid "Channels"
+msgstr ""
+
+msgctxt "#30109"
+msgid "Provider whitelist"
+msgstr ""
+
+msgctxt "#30110"
+msgid "Channel blacklist"
+msgstr ""
+
+msgctxt "#30111"
+msgid "Channel filters"
+msgstr ""
+
+msgctxt "#30112"
+msgid "Radio Channels"
+msgstr ""
+
+msgctxt "#30113"
+msgid "Save filters"
+msgstr ""
+
+msgctxt "#30114"
+msgid "Provider Unknown"
+msgstr ""
Oops, something went wrong.

1 comment on commit e2e6804

@emveepee

VNSIChannels.cpp was not added to pvrclient_vdr_vnsi_vcxproj so this fails Windows builds

Please sign in to comment.