Merge branch 'master' of mihanson@knoppmyth.net:LinHES-PKGBUILD

4 files changed, 94 insertions, 6 deletions

diff --git a/abs/core-testing/system-templates/PKGBUILD b/abs/core-testing/system-templates/PKGBUILD
index 3a76fe6..4a8a844 100755
--- a/abs/core-testing/system-templates/PKGBUILD
+++ b/abs/core-testing/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=system-templates
 pkgver=1.0
-pkgrel=41
+pkgrel=43
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core-testing/system-templates/templates/settings/default_1/jumppoints.txt b/abs/core-testing/system-templates/templates/settings/default_1/jumppoints.txt
new file mode 100644
index 0000000..1cbf116
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/settings/default_1/jumppoints.txt
@@ -0,0 +1,44 @@
+destination	description	keylist	hostname
+Reload Theme			REPLACEME
+Main Menu			REPLACEME
+Program Guide			REPLACEME
+Program Finder			REPLACEME
+Manage Recordings / Fix Conflicts			REPLACEME
+Program Recording Priorities			REPLACEME
+Manage Recording Rules			REPLACEME
+Channel Recording Priorities			REPLACEME
+TV Recording Playback			REPLACEME
+TV Recording Deletion			REPLACEME
+Live TV			REPLACEME
+Live TV In Guide			REPLACEME
+Status Screen			REPLACEME
+Previously Recorded			REPLACEME
+ScreenShot			REPLACEME
+Create DVD			REPLACEME
+Create Archive			REPLACEME
+Import Archive			REPLACEME
+View Archive Log			REPLACEME
+Play Created DVD			REPLACEME
+Burn DVD			REPLACEME
+Netflix Browser	Browse Netflix titles		REPLACEME
+Netflix Queue	Administer Netflix Queue		REPLACEME
+Netflix History	View Netflix History		REPLACEME
+MythGallery	Image viewer / slideshow		REPLACEME
+MythGame	Game frontend		REPLACEME
+Play music			REPLACEME
+Select music playlists			REPLACEME
+Rip CD			REPLACEME
+Scan music			REPLACEME
+Show Music Miniplayer			REPLACEME
+MythNews	RSS News feed reader		REPLACEME
+MythSmolt	Sample plugin	Ctrl+Alt+P	REPLACEME
+MythStream	AV stream plugin		REPLACEME
+MythVideo	The MythVideo default view		REPLACEME
+Video Manager	The MythVideo video manager		REPLACEME
+Video Browser	The MythVideo video browser		REPLACEME
+Video Listings	The MythVideo video listings		REPLACEME
+Video Gallery	The MythVideo video gallery		REPLACEME
+Play DVD	Play a DVD		REPLACEME
+Play VCD	Play a VCD		REPLACEME
+Rip DVD	Import a DVD into your MythVideo database		REPLACEME
+MythWeather	Weather forecasts		REPLACEME
diff --git a/abs/core-testing/system-templates/templates/settings/default_2/jumppoints.txt b/abs/core-testing/system-templates/templates/settings/default_2/jumppoints.txt
new file mode 100644
index 0000000..1cbf116
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/settings/default_2/jumppoints.txt
@@ -0,0 +1,44 @@
+destination	description	keylist	hostname
+Reload Theme			REPLACEME
+Main Menu			REPLACEME
+Program Guide			REPLACEME
+Program Finder			REPLACEME
+Manage Recordings / Fix Conflicts			REPLACEME
+Program Recording Priorities			REPLACEME
+Manage Recording Rules			REPLACEME
+Channel Recording Priorities			REPLACEME
+TV Recording Playback			REPLACEME
+TV Recording Deletion			REPLACEME
+Live TV			REPLACEME
+Live TV In Guide			REPLACEME
+Status Screen			REPLACEME
+Previously Recorded			REPLACEME
+ScreenShot			REPLACEME
+Create DVD			REPLACEME
+Create Archive			REPLACEME
+Import Archive			REPLACEME
+View Archive Log			REPLACEME
+Play Created DVD			REPLACEME
+Burn DVD			REPLACEME
+Netflix Browser	Browse Netflix titles		REPLACEME
+Netflix Queue	Administer Netflix Queue		REPLACEME
+Netflix History	View Netflix History		REPLACEME
+MythGallery	Image viewer / slideshow		REPLACEME
+MythGame	Game frontend		REPLACEME
+Play music			REPLACEME
+Select music playlists			REPLACEME
+Rip CD			REPLACEME
+Scan music			REPLACEME
+Show Music Miniplayer			REPLACEME
+MythNews	RSS News feed reader		REPLACEME
+MythSmolt	Sample plugin	Ctrl+Alt+P	REPLACEME
+MythStream	AV stream plugin		REPLACEME
+MythVideo	The MythVideo default view		REPLACEME
+Video Manager	The MythVideo video manager		REPLACEME
+Video Browser	The MythVideo video browser		REPLACEME
+Video Listings	The MythVideo video listings		REPLACEME
+Video Gallery	The MythVideo video gallery		REPLACEME
+Play DVD	Play a DVD		REPLACEME
+Play VCD	Play a VCD		REPLACEME
+Rip DVD	Import a DVD into your MythVideo database		REPLACEME
+MythWeather	Weather forecasts		REPLACEME
diff --git a/abs/core-testing/system-templates/templates/settings/default_2/settings.txt b/abs/core-testing/system-templates/templates/settings/default_2/settings.txt
index 106be04..8c3a391 100644
--- a/abs/core-testing/system-templates/templates/settings/default_2/settings.txt
+++ b/abs/core-testing/system-templates/templates/settings/default_2/settings.txt
@@ -74,7 +74,6 @@ GuiOffsetY	0	REPLACEME
 GuiSizeForTV	0	REPLACEME
 GuiVidModeResolution	640x480	REPLACEME
 GuiWidth	0	REPLACEME
-HaltCommand	halt	REPLACEME
 HideMouseCursor	1	REPLACEME
 HorizScanPercentage	0	REPLACEME
 Ignore_ID3	0	REPLACEME
@@ -126,7 +125,7 @@ LogPrintLevel	8	REPLACEME
 LogPrintLevel	8	REPLACEME
 LongChannelFormat	<num> <name>	REPLACEME
 MasterMixerVolume	70	REPLACEME
-MenuTheme	STB-menu	REPLACEME
+MenuTheme	MythVantage-menu	REPLACEME
 MixerControl	PCM	REPLACEME
 MixerDevice	/dev/mixer	REPLACEME
 MonitorDrives	0	REPLACEME
@@ -248,7 +247,7 @@ SlideshowTransition	none	REPLACEME
 SmartChannelChange	0	REPLACEME
 SmartForward	0	REPLACEME
 StickyKeys	1	REPLACEME
-Style		REPLACEME
+Style	Windows	REPLACEME
 SubTitleCommand	-sid %s	REPLACEME
 TagSeparator	 - 	REPLACEME
 Theme	basic-blue	REPLACEME
@@ -276,7 +275,6 @@ UnknownCategory	Unknown	REPLACEME
 UnknownTitle	Unknown	REPLACEME
 upnp:UDN:urn:schemas-upnp-org:device:MediaServer:1	dee5b0fe-7087-4960-8794-428d3e01a61f	REPLACEME
 UseArrowAccels	1	REPLACEME
-UseDHCP	1	REPLACEME
 UseOutputPictureControls	1	REPLACEME
 UseVideoModes	0	REPLACEME
 UseVideoTimebase	0	REPLACEME
@@ -293,9 +291,9 @@ VideoGalleryColsPerPage	4	REPLACEME
 VideoGalleryNoDB	0	REPLACEME
 VideoGalleryRowsPerPage	3	REPLACEME
 VideoGallerySubtitle	1	REPLACEME
-VideoDefaultPlayer	/usr/bin/playmedia.sh VIDEO %s	REPLACEME
 VideoListUnknownFiletypes	1	REPLACEME
 VideoNewBrowsable	1	REPLACEME
+VideoDefaultPlayer	Internal	REPLACEME
 VideoStartupDir	/data/media/video/movies	REPLACEME
 VideoTreeLoadMetaData	1	REPLACEME
 VideoTreeNoDB	0	REPLACEME
@@ -318,3 +316,5 @@ WebBrowserScrollSpeed	4	REPLACEME
 WebBrowserZoomLevel	20	REPLACEME
 XScanDisplacement	0	REPLACEME
 YScanDisplacement	0	REPLACEME
+HaltCommand	sudo /sbin/poweroff	REPLACEME
+RebootCommand	sudo /sbin/reboot	REPLACEME