Permalink
Browse files

Merge pull request #240 from sub3/master

Further enhancements and bug fixes to pvr.nextpvr addon
  • Loading branch information...
Lars Op den Kamp
Lars Op den Kamp committed Dec 11, 2013
2 parents d4cb4d5 + 7a20ea7 commit ca5d4d5ecb8004822d27f1c76bd7889dbfb39e4a
@@ -22,5 +22,6 @@ libnextpvr_addon_la_SOURCES = src/client.cpp \
src/uri.cpp \
src/md5.cpp \
src/liveshift.cpp \
- src/RingBuffer.cpp
+ src/RingBuffer.cpp \
+ src/DialogRecordPref.cpp
libnextpvr_addon_la_LDFLAGS = @TARGET_LDFLAGS@
@@ -1,3 +1,11 @@
+v1.9.6
+- added dialog to set recurring recordings, including recurrence type, padding, number of recordings to keep, and recording directory
+- added support for EDL
+- added support for retrieving and storing last playback position
+- now requires NextPVR 3.1.1 or higher
+- fixed a bug that could cause an EPG event with no description to have a copy of last show's description, or cause a crash if the user was unlucky.
+- more flexible approach to genre
+
v1.9.5
- add timeshift buffer functions
@@ -64,3 +64,78 @@ msgstr ""
msgctxt "#30053"
msgid "Tuner no longer available"
msgstr ""
+
+msgctxt "#30054"
+msgid "[RECUR]"
+msgstr ""
+
+msgctxt "#30100"
+msgid "Add Timer"
+msgstr ""
+
+#Recording type
+
+msgctxt "#30120"
+msgid "Recording Type"
+msgstr ""
+
+msgctxt "#30121"
+msgid "Record Once"
+msgstr ""
+
+msgctxt "#30122"
+msgid "Record Season (NEW episodes on this channel)"
+msgstr ""
+
+msgctxt "#30123"
+msgid "Record Season (All episodes on this channel)"
+msgstr ""
+
+msgctxt "#30124"
+msgid "Record Season (Daily, this timeslot)"
+msgstr ""
+
+msgctxt "#30125"
+msgid "Record Season (Weekly, this timeslot)"
+msgstr ""
+
+msgctxt "#30126"
+msgid "Record Season (Monday-Friday, this timeslot)"
+msgstr ""
+
+msgctxt "#30127"
+msgid "Record Season (Weekends, this timeslot)"
+msgstr ""
+
+
+#Keep count
+
+msgctxt "#30130"
+msgid "Keep"
+msgstr ""
+
+msgctxt "#30131"
+msgid "All Recordings"
+msgstr ""
+
+#Padding
+
+msgctxt "#30132"
+msgid "Pre-Padding (minutes)"
+msgstr ""
+
+msgctxt "#30133"
+msgid "Pre-Padding (minutes)"
+msgstr ""
+
+
+#Recording directory
+
+msgctxt "#30134"
+msgid "Recording Directory"
+msgstr ""
+
+msgctxt "#30135"
+msgid "Default"
+msgstr ""
+
@@ -0,0 +1,215 @@
+<window>
+ <defaultcontrol always="true">21</defaultcontrol>
+ <coordinates>
+ <system>1</system>
+ <posx>240</posx>
+ <posy>100</posy>
+ </coordinates>
+ <include>dialogeffect</include>
+ <controls>
+ <control type="image">
+ <description>background image</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>800</width>
+ <height>500</height>
+ <texture border="40">DialogBack.png</texture>
+ </control>
+ <control type="image">
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>720</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
+ </control>
+ <control type="label">
+ <description>header label</description>
+ <posx>40</posx>
+ <posy>20</posy>
+ <width>720</width>
+ <height>30</height>
+ <font>font13_title</font>
+ <label>$ADDON[pvr.nextpvr 30100]</label>
+ <align>center</align>
+ <aligny>center</aligny>
+ <textcolor>selected</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="button" id="22">
+ <description>Close Window button</description>
+ <posx>710</posx>
+ <posy>15</posy>
+ <width>64</width>
+ <height>32</height>
+ <label>-</label>
+ <font>-</font>
+ <!--<onclick>PreviousMenu</onclick>-->
+ <texturefocus>DialogCloseButton-focus.png</texturefocus>
+ <texturenofocus>DialogCloseButton.png</texturenofocus>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ <visible>system.getbool(input.enablemouse)</visible>
+ </control>
+
+
+ <control type="label" description="program title" id = "20">
+ <posx>40</posx>
+ <posy>60</posy>
+ <width>720</width>
+ <height>30</height>
+ <font>font13_title</font>
+ <!--<label>filled in by code</label>-->
+ <align>left</align>
+ <aligny>center</aligny>
+ <textcolor>white</textcolor>
+ <!--<shadowcolor>black</shadowcolor>-->
+ </control>
+
+ <control type="label" description="program description" id = "24">
+ <posx>40</posx>
+ <posy>100</posy>
+ <width>720</width>
+ <height>100</height>
+ <font>font13_title</font>
+ <!--<label>filled in by code</label>-->
+ <align>left</align>
+ <aligny>center</aligny>
+ <textcolor>grey2</textcolor>
+ <!--<shadowcolor>black</shadowcolor>-->
+ <wrapmultiline>true</wrapmultiline>
+ </control>
+
+ <control type="spincontrolex" id="21">
+ <description>recording type</description>
+ <posx>40</posx>
+ <posy>200</posy>
+ <width>720</width>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ <label>$ADDON[pvr.nextpvr 30120]</label>
+ <onright>21</onright>
+ <onleft>21</onleft>
+ <onup>1</onup>
+ <ondown>25</ondown>
+ </control>
+
+ <control type="spincontrolex" id="25">
+ <description>pre padding</description>
+ <posx>40</posx>
+ <posy>245</posy>
+ <width>720</width>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ <label>$ADDON[pvr.nextpvr 30132]</label>
+ <onright>23</onright>
+ <onleft>23</onleft>
+ <onup>21</onup>
+ <ondown>26</ondown>
+ </control>
+
+ <control type="spincontrolex" id="26">
+ <description>post padding</description>
+ <posx>40</posx>
+ <posy>290</posy>
+ <width>720</width>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ <label>$ADDON[pvr.nextpvr 30133]</label>
+ <onright>23</onright>
+ <onleft>23</onleft>
+ <onup>25</onup>
+ <ondown>23</ondown>
+ </control>
+
+ <control type="spincontrolex" id="23">
+ <description>keep count</description>
+ <posx>40</posx>
+ <posy>335</posy>
+ <width>720</width>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ <label>$ADDON[pvr.nextpvr 30130]</label>
+ <onright>23</onright>
+ <onleft>23</onleft>
+ <onup>26</onup>
+ <ondown>27</ondown>
+ </control>
+
+ <control type="spincontrolex" id="27">
+ <description>recording directory</description>
+ <posx>40</posx>
+ <posy>380</posy>
+ <width>720</width>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ <label>$ADDON[pvr.nextpvr 30134]</label>
+ <onright>23</onright>
+ <onleft>23</onleft>
+ <onup>23</onup>
+ <ondown>1</ondown>
+ </control>
+
+ <control type="group" id="9001">
+ <posx>190</posx>
+ <posy>435</posy>
+ <control type="button" id="1">
+ <description>Ok Button</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>200</width>
+ <height>40</height>
+ <align>center</align>
+ <aligny>center</aligny>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus.png</texturefocus>
+ <label>186</label>
+ <font>font12_title</font>
+ <onup>27</onup>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <ondown>21</ondown>
+ </control>
+ <control type="button" id="2">
+ <description>Cancel Button</description>
+ <posx>210</posx>
+ <posy>0</posy>
+ <width>200</width>
+ <height>40</height>
+ <align>center</align>
+ <aligny>center</aligny>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus.png</texturefocus>
+ <label>222</label>
+ <font>font12_title</font>
+ <onup>27</onup>
+ <onleft>1</onleft>
+ <onright>1</onright>
+ <ondown>21</ondown>
+ </control>
+ </control>
+
+ </controls>
+</window>
@@ -107,6 +107,10 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
</Link>
+ <PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\project\VS2010Express\platform\platform.vcxproj">
@@ -118,6 +122,7 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\client.cpp" />
+ <ClCompile Include="..\..\src\DialogRecordPref.cpp" />
<ClCompile Include="..\..\src\liveshift.cpp" />
<ClCompile Include="..\..\src\md5.cpp" />
<ClCompile Include="..\..\src\pvrclient-nextpvr.cpp" />
@@ -127,6 +132,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\client.h" />
+ <ClInclude Include="..\..\src\DialogRecordPref.h" />
<ClInclude Include="..\..\src\liveshift.h" />
<ClInclude Include="..\..\src\md5.h" />
<ClInclude Include="..\..\src\pvrclient-nextpvr.h" />
@@ -32,6 +32,9 @@
<ClCompile Include="..\..\src\liveshift.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\DialogRecordPref.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\client.h">
@@ -55,5 +58,8 @@
<ClInclude Include="..\..\src\liveshift.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\DialogRecordPref.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
Oops, something went wrong.

0 comments on commit ca5d4d5

Please sign in to comment.