revert tweaker changes

1 files changed, 32 insertions, 33 deletions

diff --git a/abs/core-testing/tweaker/bin/twk_general.pl b/abs/core-testing/tweaker/bin/twk_general.pl
index 8ebc1f0..0255852 100755
--- a/abs/core-testing/tweaker/bin/twk_general.pl
+++ b/abs/core-testing/tweaker/bin/twk_general.pl
@@ -333,35 +333,34 @@ sub implement_option {
 	    change_or_make_setting('GalleryDir', $SQL_DirPics);
 	    change_or_make_setting('GalleryRecursiveSlideshow', '1');
 	    change_or_make_setting('HaltCommand', 'sudo /sbin/halt');
-#	    change_or_make_setting('HostAudiotype','ALSA');
-#	    change_or_make_setting('HostMiro','1');
-#	    change_or_make_setting('HostXine','1');
-#	    change_or_make_setting('Hostpluginmythappletrailers','1');
-#	    change_or_make_setting('Hostpluginmytharchive','1');
-#	    change_or_make_setting('Hostpluginmythbrowser','1');
-#	    change_or_make_setting('Hostpluginmythcontrols','1');
-#	    change_or_make_setting('Hostpluginmythflix','1');
-#	    change_or_make_setting('Hostpluginmythgallery','1');
-#	    change_or_make_setting('Hostpluginmythgame','1');
-#	    change_or_make_setting('HostpluginmythgameFceu','1');
-#	    change_or_make_setting('HostpluginmythgameMame','1');
-#	    change_or_make_setting('HostpluginmythgameMame','1');
-#	    change_or_make_setting('HostpluginmythgameROMDB','1');
-#	    change_or_make_setting('HostpluginmythgameXE','1');
-#       change_or_make_setting('HostpluginmythgameZsnes','1');
-#	    change_or_make_setting('HostpluginmythgameZsnes','1');
-#	    change_or_make_setting('Hostpluginmythmovietime','1');
-#	    change_or_make_setting('Hostpluginmythmusic','1');
-#	    change_or_make_setting('Hostpluginmythnews','1');
-#	    change_or_make_setting('Hostpluginmythphone','1');
-#	    change_or_make_setting('Hostpluginmythsmolt','1');
-#	    change_or_make_setting('Hostpluginmythstream','1');
-#	    change_or_make_setting('Hostpluginmythvideo','1');
-#	    change_or_make_setting('Hostpluginmythvideo_dvdcss','0');
-#	    change_or_make_setting('Hostpluginmythvideo_dvdcss','0');
-#	    change_or_make_setting('Hostpluginmythvodka','1');
-#	    change_or_make_setting('Hostpluginmythweather','1');
-#	    change_or_make_setting('Hostaccessuser','1');
+	    change_or_make_setting('HostAudiotype','ALSA');
+	    change_or_make_setting('HostMiro','1');
+	    change_or_make_setting('HostXine','1');
+	    change_or_make_setting('Hostpluginmythappletrailers','1');
+	    change_or_make_setting('Hostpluginmytharchive','1');
+	    change_or_make_setting('Hostpluginmythbrowser','1');
+	    change_or_make_setting('Hostpluginmythcontrols','1');
+	    change_or_make_setting('Hostpluginmythflix','1');
+	    change_or_make_setting('Hostpluginmythgallery','1');
+	    change_or_make_setting('Hostpluginmythgame','1');
+	    change_or_make_setting('HostpluginmythgameFceu','1');
+	    change_or_make_setting('HostpluginmythgameMame','1');
+	    change_or_make_setting('HostpluginmythgameMame','1');
+	    change_or_make_setting('HostpluginmythgameROMDB','1');
+	    change_or_make_setting('HostpluginmythgameXE','1');
+	    change_or_make_setting('HostpluginmythgameZsnes','1');
+	    change_or_make_setting('HostpluginmythgameZsnes','1');
+	    change_or_make_setting('Hostpluginmythmovietime','1');
+	    change_or_make_setting('Hostpluginmythmusic','1');
+	    change_or_make_setting('Hostpluginmythnews','1');
+	    change_or_make_setting('Hostpluginmythphone','1');
+	    change_or_make_setting('Hostpluginmythsmolt','1');
+	    change_or_make_setting('Hostpluginmythstream','1');
+	    change_or_make_setting('Hostpluginmythvideo','1');
+	    change_or_make_setting('Hostpluginmythvideo_dvdcss','0');
+	    change_or_make_setting('Hostpluginmythvideo_dvdcss','0');
+	    change_or_make_setting('Hostpluginmythvodka','1');
+	    change_or_make_setting('Hostpluginmythweather','1');
 	    change_or_make_setting('JobAllowCommFlag', '1');
 	    change_or_make_setting('JobAllowTranscode', '1');
 	    change_or_make_setting('JobAllowUserJob1', '1');
@@ -376,7 +375,7 @@ sub implement_option {
 	    change_or_make_setting('JobsRunOnRecordHost','0');
 	    change_or_make_setting('LiveTVInAllPrograms','1');
 	    change_or_make_setting('MasterMixerVolume','100');
-#	    change_or_make_setting('MasterServerIP', '127.0.0.1');
+	    change_or_make_setting('MasterServerIP', '127.0.0.1');
 	    change_or_make_setting('MasterServerPort', '6543');
 	    change_or_make_setting('MediaChangeEvents','1');
 	    change_or_make_setting('MonitorDrives', '1');
@@ -483,8 +482,8 @@ sub implement_option {
 	    $ipaddress =~ s/.*inet addr:(\d+.\d+.\d+.\d+)\s.*/$1/g;
 
 	    # Change from the generic IP address to the real one.
-#	    do_query("UPDATE settings SET data='$ipaddress' where data='127.0.0.1'");
-#	    do_query("UPDATE settings SET data='$ipaddress' where data='MythTVip'"); # ??? needed?
+	    do_query("UPDATE settings SET data='$ipaddress' where data='127.0.0.1'");
+	    do_query("UPDATE settings SET data='$ipaddress' where data='MythTVip'"); # ??? needed?
 	    
 	    my $hostname = execute_shell_command("hostname") || "localhost";
 	    # one table at a time, replace hostname with our actual hostname
@@ -500,7 +499,7 @@ sub implement_option {
 	    # easier to maintain and more future-proof.
 	    foreach my $entry ("mythfilldatabaseLastRunStart", "mythfilldatabaseLastRunEnd", "mythfilldatabaseLastRunStatus",
 			       "DataDirectMessage", "HaveRepeats", "DBSchemaVer", "DefaultTranscoder", "MythFillSuggestedRunTime",
-			       "MythFillGrabberSuggestsTime",  "MasterServerPort", "TVFormat", "VbiFormat", "FreqTable",
+			       "MythFillGrabberSuggestsTime", "MasterServerIP", "MasterServerPort", "TVFormat", "VbiFormat", "FreqTable",
 			       "TimeOffset", "MasterBackendOverride", "DeletesFollowLinks", "HDRingbufferSize", "EITTransportTimeout",
 			       "EITIgnoresSource", "EITCrawIdleStart", "startupCommand", "blockSDWUwithoutClient", "idleWaitForRecordingTime",
 			       "StartupSecsBeforeRecording", "WakeupTimeFormat", "SetWakeuptimeCommand", "ServerHaltCommand", "preSDWUCheckCommand",