This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository mteleplayer. from 768876d Minor cleanup and adding more cache info handeling on both sides of the wormhole new 531d506 Minor cleanup of old junk we don't need... new a3a0e52 Improves volume control The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .../mteleplayer/bin/mteleplayer_clientside | 7 +-- serverside/bin/mteleplayer | 55 +++++++++++--------- 2 files changed, 33 insertions(+), 29 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository mteleplayer. commit 531d50607fe09157f760d451c8a716799a6c5fb0 Author: gznget <opensource@gznianguan.com> Date: Sun Jun 29 16:45:25 2014 +0200 Minor cleanup of old junk we don't need... --- .../mteleplayer/bin/mteleplayer_clientside | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside index 561ef19..3cf427a 100755 --- a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside +++ b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside @@ -116,12 +116,10 @@ $mpState{'volume'} = 0;# Change this to get from server side! $mpState{'osd'} = 0; $mpState{'LASTINPUT'} = "";$mpState{'prevSecond'} = 0; ###########################33 -# CHANGE THIS!!! -open(SRF,">$LocalAppDataDIR/stillrunning");print SRF time(),"\n";close(SRF);# CHANGE THIS!!! -# CHANGE THIS!!! + ########################## $sstatusi{'lastCOMtime'} = (time()+2); -$TnW{'timeoutRound'} = Glib::Timeout->add (1000, sub {open(SRF,">$LocalAppDataDIR/stillrunning");print SRF time(),"\n";close(SRF);appCOM("YO!");if ($sstatusi{'lastCOMtime'} < (time()-2)) {&doSelfTerminate;}1;}); +$TnW{'timeoutRound'} = Glib::Timeout->add (1000, sub {appCOM("YO!");if ($sstatusi{'lastCOMtime'} < (time()-2)) {&doSelfTerminate;}1;}); #$TnW{'overlaystatechange'} = Glib::Timeout->add (250, \&overlayStateChange); connectionPresistance(); Gtk2->init; @@ -571,7 +569,6 @@ sub doSelfTerminate { if ($TnW{'timeoutRound'}) { Glib::Source->remove($TnW{'timeoutRound'}); } - unlink("$LocalAppDataDIR/stillrunning"); $runSTATE = "T"; mpCMD("quit"); usleep(100000); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git
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@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
-
git-admin＠x2go.org