This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository mteleplayer. from 9565534 fix typo: UNCUAGHT -> UNCAUGHT new 01a5572 mtp_clientside: Cache percentage shown in a range from 0-100% now. new 0be5174 LANG=C -> ensure that we talk to mplayer in English 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 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 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 01a55723b4439d2aa3c25942e4dfea2f6be789cf 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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository mteleplayer. commit 0be517477b7a8c91a768380ae3e45660b4d747d0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 1 00:03:28 2014 +0200 LANG=C -> ensure that we talk to mplayer in English --- .../mteleplayer/bin/mteleplayer_clientside | 1 + 1 file changed, 1 insertion(+) diff --git a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside index 922d216..60d5a13 100755 --- a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside +++ b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside @@ -37,6 +37,7 @@ # ################################################################################################################## $ENV{'PATH'} = "/bin:/usr/bin"; +$ENV{'LANG'} = "C"; our $TEKIAPPDEBUG = 1; our $APPNAME = "mteleplayer"; our $APPVER = "0.0.3.0"; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git
-
git-admin＠x2go.org