summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/drakdvb5
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 . '"&');