from Components.Harddisk import harddiskmanager
from Components.NimManager import nimmanager
from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigNumber, ConfigSet, ConfigLocations
+from Tools.Directories import defaultRecordingLocation
from Tools.Directories import resolveFilename, SCOPE_HDD
from enigma import Misc_Options, eEnv
from enigma import setTunerTypePriorityOrder, setPreferredTuner
("standard", _("standard")), ("swap", _("swap PiP and main picture")),
("swapstop", _("move PiP to main picture")), ("stop", _("stop PiP")) ])
- config.usage.default_path = ConfigText(default = resolveFilename(SCOPE_HDD))
+ config.usage.default_path = ConfigText(default = "")
config.usage.timer_path = ConfigText(default = "<default>")
config.usage.instantrec_path = ConfigText(default = "<default>")
config.usage.timeshift_path = ConfigText(default = "/media/hdd/")
("150", "50%")])
config.subtitles.subtitle_original_position = ConfigYesNo(default = True)
config.subtitles.subtitle_alignment = ConfigSelection(choices = [("left", _("left")), ("center", _("center")), ("right", _("right"))], default = "center")
- config.subtitles.subtitle_position = ConfigSelection( choices = ["0", "50", "100", "150", "200", "250", "300", "350", "400", "450", "500", "550", "600"], default = "50")
+ config.subtitles.subtitle_position = ConfigSelection( choices = ["0", "50", "100", "150", "200", "250", "300", "350", "400", "450", "500", "550", "600"], default = "100")
config.subtitles.dvb_subtitles_centered = ConfigYesNo(default = False)
sel.setChoices(map(str, choices), defval)
def preferredPath(path):
- if config.usage.setup_level.index < 2 or path == "<default>":
+ if config.usage.setup_level.index < 2 or path == "<default>" or not path:
return None # config.usage.default_path.value, but delay lookup until usage
elif path == "<current>":
return config.movielist.last_videodir.value
return preferredPath(config.usage.instantrec_path.value)
def defaultMoviePath():
- return config.usage.default_path.value
+ return defaultRecordingLocation(config.usage.default_path.value)