diff options
| author | Andreas Frisch <andreas.frisch@multimedia-labs.de> | 2008-10-08 15:36:49 +0000 |
|---|---|---|
| committer | Andreas Frisch <andreas.frisch@multimedia-labs.de> | 2008-10-08 15:36:49 +0000 |
| commit | 7416bb955a8eee1764a969116a54e3996fec429d (patch) | |
| tree | 4b7a46276d9a748aa9fe2bd948f47098a302672f /lib/python/Plugins/Extensions/DVDBurn | |
| parent | db46f952f934ea8532527cbbdf21ef283cacda20 (diff) | |
| download | enigma2-7416bb955a8eee1764a969116a54e3996fec429d.tar.gz enigma2-7416bb955a8eee1764a969116a54e3996fec429d.zip | |
get rid of hardcoded path to cdrom device
Diffstat (limited to 'lib/python/Plugins/Extensions/DVDBurn')
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py | 5 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDBurn/Process.py | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py index c766ad52..30487b69 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py +++ b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py @@ -7,6 +7,7 @@ from Components.Sources.StaticText import StaticText from Components.Sources.Progress import Progress from Components.Task import Task, Job, job_manager, Condition from Components.ScrollLabel import ScrollLabel +from Components.Harddisk import harddiskmanager class DVDToolbox(Screen): skin = """ @@ -161,7 +162,7 @@ class DVDformatTask(Task): self.toolbox = job.toolbox self.postconditions.append(DVDformatTaskPostcondition()) self.setTool("/bin/dvd+rw-format") - self.args += [ "/dev/cdroms/cdrom0" ] + self.args += [ harddiskmanager.getCD() ] self.end = 1100 def prepare(self): @@ -205,7 +206,7 @@ class DVDinfoTask(Task): self.toolbox = job.toolbox self.postconditions.append(DVDinfoTaskPostcondition()) self.setTool("/bin/dvd+rw-mediainfo") - self.args += [ "/dev/cdroms/cdrom0" ] + self.args += [ harddiskmanager.getCD() ] def prepare(self): self.error = None diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py index 74f23f15..71f7c998 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Process.py +++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py @@ -1,4 +1,5 @@ from Components.Task import Task, Job, job_manager, DiskspacePrecondition, Condition, ToolExistsPrecondition +from Components.Harddisk import harddiskmanager from Screens.MessageBox import MessageBox class png2yuvTask(Task): @@ -264,7 +265,7 @@ class BurnTask(Task): self.postconditions.append(BurnTaskPostcondition()) self.setTool("/bin/growisofs") volName = self.getASCIIname(job.project.settings.name.getValue()) - self.args += [ "-dvd-compat", "-Z", "/dev/cdroms/cdrom0", "-V", volName, "-publisher", "Dreambox", "-use-the-force-luke=dummy" ] + self.args += [ "-dvd-compat", "-Z", harddiskmanager.getCD(), "-V", volName, "-publisher", "Dreambox", "-use-the-force-luke=dummy" ] self.args += extra_args def getASCIIname(self, name): @@ -302,7 +303,7 @@ class BurnTask(Task): self.error = self.ERROR_SIZE elif line.find("write failed") != -1: self.error = self.ERROR_WRITE_FAILED - elif line.find("unable to open64(\"/dev/cdroms/cdrom0\",O_RDONLY): No such file or directory") != -1: # fixme + elif line.find("unable to open64(") != -1 and line.find(",O_RDONLY): No such file or directory") != -1: self.error = self.ERROR_DVDROM elif line.find("media is not recognized as recordable DVD") != -1: self.error = self.ERROR_NOTWRITEABLE |