[X2Go-Commits] [mteleplayer] 02/02: Improves volume control
git-admin at x2go.org
git-admin at x2go.org
Mon Jun 30 10:48:04 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository mteleplayer.
commit a3a0e529b8adbdc08189d8df8bbaf2777f58bfe5
Author: gznget <opensource at gznianguan.com>
Date: Mon Jun 30 09:30:43 2014 +0200
Improves volume control
---
serverside/bin/mteleplayer | 55 +++++++++++++++++++++++++-------------------
1 file changed, 31 insertions(+), 24 deletions(-)
diff --git a/serverside/bin/mteleplayer b/serverside/bin/mteleplayer
index d3174ea..e529b89 100755
--- a/serverside/bin/mteleplayer
+++ b/serverside/bin/mteleplayer
@@ -824,15 +824,33 @@ sub setVolumeICON {
}
sub changeAudioVolume {
- if ($GTKS{'CTRLS'}{'VolumeScaler'}{'HSCALE'}) {
- my $ValueFromScaler = sprintf("%d",$GTKS{'CTRLS'}{'VolumeScaler'}{'HSCALE'}->get_value);
- if (($ValueFromScaler >= 0) and ($ValueFromScaler <= 100)) {
- $PRESISTENT{'AudioVolume'} = $ValueFromScaler;
- appDBugLog("MANUAL VOLUME CHANGE ($PRESISTENT{'AudioVolume'})");
- setVolumeICON($PRESISTENT{'AudioVolume'},0);
+ if (($_[0] eq "down") or ($_[0] eq "up")) {
+ my $changeVolume;
+ if ($_[0] eq "down") {
+ $changeVolume = ($PRESISTENT{'AudioVolume'} - 5);
+ } elsif ($_[0] eq "up") {
+ $changeVolume = ($PRESISTENT{'AudioVolume'} + 5);
+ }
+ if ($changeVolume < 0) {$changeVolume = 0;}
+ if ($changeVolume > 100) {$changeVolume = 100;}
+ if ($changeVolume ne $PRESISTENT{'AudioVolume'}) {
+ $PRESISTENT{'AudioVolume'} = $changeVolume;
appCOM("SET|AUDIOVOLUME|$PRESISTENT{'AudioVolume'}|");
+ if ($GTKS{'CTRLS'}{'VolumeScaler'}{'HSCALE'}) {
+ $GTKS{'CTRLS'}{'VolumeScaler'}{'HSCALE'}->set_value($PRESISTENT{'AudioVolume'});
+ }
}
- }
+ } else {
+ if ($GTKS{'CTRLS'}{'VolumeScaler'}{'HSCALE'}) {
+ my $ValueFromScaler = sprintf("%d",$GTKS{'CTRLS'}{'VolumeScaler'}{'HSCALE'}->get_value);
+ if (($ValueFromScaler >= 0) and ($ValueFromScaler <= 100)) {
+ $PRESISTENT{'AudioVolume'} = $ValueFromScaler;
+ appDBugLog("MANUAL VOLUME CHANGE ($PRESISTENT{'AudioVolume'})");
+ setVolumeICON($PRESISTENT{'AudioVolume'},0);
+ appCOM("SET|AUDIOVOLUME|$PRESISTENT{'AudioVolume'}|");
+ }
+ }
+ }
}
sub eventBtnClickPlayPause {
@@ -884,27 +902,16 @@ sub keyPressHandler {
my ($widget,$event)= @_;
my %modMasks = getKeyModifiers($event->state());
my $keyVal = $event->keyval();
- appDBugLog("KEY: $key_nr\n");
+ appDBugLog("KEY: $keyVal\n");
if (($keyVal eq 32) or ($keyVal eq 80) or ($keyVal eq 112) or ($keyVal eq 65299)) {# PLAY/PAUSE
&eventBtnClickPlayPause;
} elsif (($keyVal eq 70) or ($keyVal eq 102)) {# Fullscreen toggler
&toggleFullScreen;
- }
-#elsif ($keyVal eq 65455) {# Audio Volume DOWN
-# my $changeVolume = ($PRESISTENT{'AudioVolume'} - 5);
-# if ($changeVolume < 0) {$changeVolume = 0;}
-# if ($changeVolume ne $PRESISTENT{'AudioVolume'}) {
-# $PRESISTENT{'AudioVolume'} = $changeVolume;
-# &changeAudioVolume;
-# }
-# } elsif ($keyVal eq 65450) {# Audio Volume UP
-# my $changeVolume = ($PRESISTENT{'AudioVolume'} + 5);
-# if ($changeVolume > 100) {$changeVolume = 100;}
-# if ($changeVolume ne $PRESISTENT{'AudioVolume'}) {
-# $PRESISTENT{'AudioVolume'} = $changeVolume;
-# &changeAudioVolume;
-# }
-# }
+ } elsif ($keyVal eq 65455) {# Audio Volume DOWN
+ changeAudioVolume("down");
+ } elsif ($keyVal eq 65450) {# Audio Volume UP
+ changeAudioVolume("up");
+ }
return FALSE;
}
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git
More information about the x2go-commits
mailing list