]>
Commit | Line | Data |
---|---|---|
67952b96 JB |
1 | diff -ur genres-0.9.2/doc/genres.conf genres-0.9.2-ah/doc/genres.conf |
2 | --- genres-0.9.2/doc/genres.conf 2006-05-13 21:49:44.000000000 +0200 | |
3 | +++ genres-0.9.2-ah/doc/genres.conf 2006-06-24 01:39:15.000000000 +0200 | |
4 | @@ -1,6 +1,6 @@ | |
5 | #common configuration file for GenRes plugin | |
6 | #put it to ~/.mozilla/genres or /etc | |
7 | ||
8 | -mozillastreams=1 # use mozilla streams (and cache), 0 - not use | |
9 | +mozillastreams=0 # use mozilla streams (and cache), 0 - not use | |
10 | debuglevel=10 # full debug output, 0 - quiet | |
11 | background=-1 # 0 - black, 1 - white, -1 - mozilla default | |
12 | diff -ur genres-0.9.2/slaves/video/mplayer.pl genres-0.9.2-ah/slaves/video/mplayer.pl | |
13 | --- genres-0.9.2/slaves/video/mplayer.pl 2006-05-13 22:57:46.000000000 +0200 | |
14 | +++ genres-0.9.2-ah/slaves/video/mplayer.pl 2006-06-24 01:38:58.000000000 +0200 | |
15 | @@ -30,8 +30,8 @@ | |
16 | ## Parameters from the config file ## | |
17 | $conffile="$ENV{HOME}/.mozilla/genres/mplayer.conf"; | |
18 | %cfg=( | |
19 | - vo=>[x11, 'text', "Video output driver (see mplayer -vo help)"], | |
20 | - ao=>["esd,arts,oss,alsa", 'text', "Audio output driver (see mplayer -ao help)"], | |
21 | + vo=>["xv,x11", 'text', "Video output driver (see mplayer -vo help)"], | |
22 | + ao=>["alsa,esd,arts,oss,null", 'text', "Audio output driver (see mplayer -ao help)"], | |
23 | not_ask=> [0, 'checkbox', "Never show file save dialog again."], | |
24 | out_file=>['%@-%Y-%m-%d_%H-%M-%S.avi', 'file', "Write video to file(s)", | |
25 | "%@ in the filename will be replaced to source URL\n" | |
26 | @@ -371,7 +371,8 @@ | |
27 | $sl2p=open(SL2W,$cmd2); | |
28 | } else { | |
29 | $OPTS.=" -ao $cfg{ao}[0]" if $cfg{ao}[0]; | |
30 | - $cmd="mplayer $OPTS -vo $cfg{vo}[0] -zoom -nojoystick -slave -nomouseinput -cookies '$href'"; | |
31 | + my $pls = ($href =~ /asx$/) ? "-playlist" : ""; | |
32 | + $cmd="mplayer $OPTS -vo $cfg{vo}[0] -zoom -nojoystick -slave -nomouseinput -cookies $pls '$href'"; | |
33 | print "cmd=$cmd\n"; | |
34 | runslv $cmd; | |
35 | } |