diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-02-19 17:09:11 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-02-19 17:09:11 +0000 |
| commit | 7e3966c73debdccf5fa45fd85d6d64d1bf14f4bc (patch) | |
| tree | 5aca45cd8c724f71c44f2e390f100cf74109f9bb | |
| parent | 0df491015e36fdae8eaf1aa60a70614096ac24e9 (diff) | |
| download | drakx-7e3966c73debdccf5fa45fd85d6d64d1bf14f4bc.tar drakx-7e3966c73debdccf5fa45fd85d6d64d1bf14f4bc.tar.gz drakx-7e3966c73debdccf5fa45fd85d6d64d1bf14f4bc.tar.bz2 drakx-7e3966c73debdccf5fa45fd85d6d64d1bf14f4bc.tar.xz drakx-7e3966c73debdccf5fa45fd85d6d64d1bf14f4bc.zip | |
kill running vlc if configured with one-instance by default (it does not use DVB options from new command line)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakdvb | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 675e0a197..a0548e295 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -5,6 +5,8 @@ - drakdvb: o sort channels list o prefer vlc if present + o kill running vlc if configured with one-instance by default + (it does not use DVB options from new command line) Version 11.88 - 16 February 2009 diff --git a/perl-install/standalone/drakdvb b/perl-install/standalone/drakdvb index 84d7f077e..eb5d4909c 100755 --- a/perl-install/standalone/drakdvb +++ b/perl-install/standalone/drakdvb @@ -127,6 +127,11 @@ sub launch_tv() { my $channel = get_selected_channel() or return; if (whereis_binary("vlc")) { my $info = get_channel_info($channel) or return; + my %vlc_config = read_gnomekderc("$ENV{HOME}/.config/vlc/vlcrc", "main"); + if ($vlc_config{'one-instance'}) { + # changing dvb options does not work with --one-instance, kill running vlc + system("killall vlc"); + } system("vlc dvb:// --dvb-frequency=$info->{frequency} --dvb-adapter=0 --dvb-bandwidth=$info->{bandwidth} --program=$info->{serviceid} &"); } else { system('mplayer "dvb://' . $channel . '"&'); |