This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch gzng in repository mteleplayer. commit 7b54703171cc7b6c5b3c529cb53a2b545816bff5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 1 00:02:52 2014 +0200 mtp_clientside: Cache percentage shown in a range from 0-100% now. --- .../mteleplayer/bin/mteleplayer_clientside | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside index e8d15f1..922d216 100755 --- a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside +++ b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside @@ -117,6 +117,11 @@ if (-x "/usr/bin/mplayer2") { $mPlayerPath = "/usr/bin/mplayer2"; } +# size of cache in kByte +my $mpCacheSize = 4096; +# fill cache to $mpCacheMinimum percent before video starts +my $mpCacheMinimum = 20.0; + my $LocalSocket; if (-S $TeKiLSockPath) { # We used to do connection stuff here... we still may want to do something here.... who knows... @@ -371,7 +376,7 @@ sub appCOM { sub do_mplayer{ my $gdkwindow1 = $ebox->window; my $xid= $gdkwindow1->XWINDOW; - my $pid = open($mpFH,"-|",$mPlayerPath,'-slave','-input' ,"file=$SlaveFIFO", '-vo','gl','-framedrop','-fs','-wid',$xid,'-volume','0', '-identify','-idle','-nolirc','-cache','4096'); + my $pid = open($mpFH,"-|",$mPlayerPath,'-slave','-input' ,"file=$SlaveFIFO", '-vo','gl','-framedrop','-fs','-wid',$xid,'-volume','0', '-identify','-idle','-nolirc','-cache-min', "$mpCacheMinimum", '-cache',"$mpCacheSize"); $TnW{'mplayerIOwatcher'} = Gtk2::Helper->add_watch( $mpFH->fileno, 'in', sub {watch_mplayerOutput( $mpFH,$TnW{'mplayerIOwatcher'} );}); } @@ -446,7 +451,10 @@ sub watch_mplayerOutput { $mpState{'mediaFileName'} = $1; } elsif ($line =~ /^Cache fill:([\ \d\.\%]*)\((\d*) bytes\)/) { appDBugLog("Cache fill! [$1] [$2]"); - my $cacheP = $1;$cacheP =~ s/\ //g; + my $cacheRelPercent = $1; $cacheRelPercent =~ s/(\ |\%)//g; + my $cacheAbsPercent = 100 / $mpCacheMinimum * $cacheRelPercent; + appDBugLog("Cache fill! [$cacheAbsPercent] [$2]"); + my $cacheP = $cacheAbsPercent; $cacheP =~ s/\ //g; my $cacheB = $2;$cacheB =~ s/\D//g; appCOM("CACHING|$cacheP|$cacheB|"); } elsif ($line =~ /===== PAUSE =====/) { -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git