Changeset 1873

Timestamp:

10/11/08 17:36:57 (2 months ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11155

Message:

[ 2249030 ] mplayer does not play dvd on hard disk.
Fix applied

Location:

freevo

Files:

• ChangeLog (modified) (1 diff)
• src/video/plugins/mplayer.py (modified) (3 diffs)

freevo/ChangeLog

@@ -34 +34 @@
  * Fixed mplayer crash when auto cropping is enabled (B#2089592)
  * Fixed mplayer when playlist is enabled (B#2219657)
+ * Fixed mplayer when playing a DVD iso (B#2249030)
  * Fixed record server auto re-encode show title (B#2193796)
  * Fixed record server generic record module to allow a group_type to be given (B#2017200)

freevo/src/video/plugins/mplayer.py

@@ -215 +215 @@
         if mode == 'dvd':
             # dvd on harddisc
-            args['dvd-device'] = '-dvd-device %s' % item.filename
+            args['dvd-device'] = '%s' % item.filename
             args['url'] = url[:6] + url[url.rfind('/')+1:]
         elif mode != 'file' and hasattr(item.media, 'devicename'):
-            args['dvd-device'] = '-dvd-device %s' % item.media.devicename
+            args['dvd-device'] = '%s' % item.media.devicename
 
         if item.media and hasattr(item.media, 'devicename'):
-            args['cdrom-device'] = '-cdrom-device %s' % item.media.devicename
+            args['cdrom-device'] = '%s' % item.media.devicename
 
         if item.selected_subtitle == -1:
@@ -323 +323 @@
         command += str('%(vc)s' % args).split()
         command += ao.split()
-        command += str('%(dvd-device)s' % args).split()
-        command += str('%(cdrom-device)s' % args).split()
+        command += args['dvd-device'] and ['-dvd-device', '%(dvd-device)s' % args] or []
+        command += args['cdrom-device'] and ['-cdrom-device', '%(cdrom-device)s' % args] or []
         command += str('%(alang)s' % args).split()
         command += str('%(aid)s' % args).split()
@@ -338 +338 @@
         command += args['mode_args'].split()
         command += args['fxd_args'].split()
-        if args['af']:
-            command += ['-af', '%s' % ','.join(args['af'])]
-        if args['vf']:
-            command += ['-vf', '%s' % ','.join(args['vf'])]
+        command += args['af'] and ['-af', '%s' % ','.join(args['af'])] or []
+        command += args['vf'] and ['-vf', '%s' % ','.join(args['vf'])] or []
 
         # use software scaler?