fenix
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[mplayer] Simplify

This commit is contained in:
Sergey M․ 2015-04-26 00:23:16 +06:00
parent b860f5dfd4
commit b874495b1f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/downloader/mplayer.py
View File

@ -16,14 +16,10 @@ class MplayerFD(FileDownloader):
self.report_destination(filename) self.report_destination(filename)
tmpfilename = self.temp_name(filename) tmpfilename = self.temp_name(filename)
args = []
# Check for mplayer first
if check_executable('mplayer', ['-h']): if check_executable('mplayer', ['-h']):
args = [ args = [
'mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy', 'mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy',
'-dumpstream', '-dumpfile', tmpfilename, url] '-dumpstream', '-dumpfile', tmpfilename, url]
# Check for mpv
elif check_executable('mpv', ['-h']): elif check_executable('mpv', ['-h']):
args = [ args = [
'mpv', '-really-quiet', '--vo=null', '--stream-dump=' + tmpfilename, url] 'mpv', '-really-quiet', '--vo=null', '--stream-dump=' + tmpfilename, url]
@ -31,7 +27,6 @@ class MplayerFD(FileDownloader):
self.report_error('MMS or RTSP download detected but neither "mplayer" nor "mpv" could be run. Please install any.') self.report_error('MMS or RTSP download detected but neither "mplayer" nor "mpv" could be run. Please install any.')
return False return False
# Download using mplayer.
retval = subprocess.call(args) retval = subprocess.call(args)
if retval == 0: if retval == 0:
fsize = os.path.getsize(encodeFilename(tmpfilename)) fsize = os.path.getsize(encodeFilename(tmpfilename))
@ -46,5 +41,5 @@ class MplayerFD(FileDownloader):
return True return True
else: else:
self.to_stderr('\n') self.to_stderr('\n')
self.report_error('mplayer exited with code %d' % retval) self.report_error('%s exited with code %d' % (args[0], retval))
return False return False