[X2Go-Commits] [mteleplayer] 25/29: Fix dancing numbers and hopefully some olMagic visibility issues

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch gzng
in repository mteleplayer.

commit 26a801f33b9e02ee873b6fa55f15b796df94a6ab
Author: gznget <opensource at gznianguan.com>
Date:   Thu Aug 28 13:12:02 2014 +0200

    Fix dancing numbers and hopefully some olMagic visibility issues
---
 .../mteleplayer/bin/mteleplayer_clientside         |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside
index 05e54b0..bb556d0 100755
--- a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside
+++ b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside
@@ -166,7 +166,7 @@ $window->show_all();
 &do_mplayer;
 doOverlayMagic('init');
 
-$TnW{'timeoutRound'} = Glib::Timeout->add (1000, sub {appCOM("YO!");if ($sstatusi{'lastCOMtime'} < (time()-2)) {&doSelfTerminate;}1;});
+$TnW{'timeoutRound'} = Glib::Timeout->add (1000, sub {appCOM("YO!");if ($sstatusi{'lastCOMtime'} < (time()-4)) {&doSelfTerminate;}1;});
 $TnW{'transglitcpresistance'} = Glib::Timeout->add(100, \&connectionPresistance);
 $TnW{'mouseDeDodger'}  = Glib::Timeout->add(100, sub {if ($olMagic{'dodgeMouse'} eq 1) {doOverlayMagic('dodgemouse',0);}1;});
 
@@ -456,8 +456,9 @@ sub watch_mplayerOutput {
 			if ($line =~ /^A:[\ \.\d]*V:([\ \.\d]*)/) {$mpState{'mediaPos'} = $1;}
 			elsif ($line =~ /^A:([\ \.\d]*)/) {$mpState{'mediaPos'} = $1;} 
 			elsif ($line =~ /^V:[\ ]*([\.\d]*[\ ]*)/) {$mpState{'mediaPos'} = $1;}
-			$mpState{'mediaPos'}++;$mpState{'mediaPos'}--;
+#			$mpState{'mediaPos'} =~ s/\ //g;
 			my ($newSecond,undef) = split(/\./,$mpState{'mediaPos'});
+			$newSecond =~ s/\D//g;$newSecond++;$newSecond--;
 			if ($newSecond ne $mpState{'prevSecond'}) {
 				$mpState{'prevSecond'} = $newSecond;
 				doReportTimePos($newSecond,$mpState{'mediaLength'});
@@ -537,8 +538,6 @@ sub doOverlayMagic {
         my $reTogVis = 0;
 	my $changePos = 0;
 	if ($doWHAT eq "init") {
-		$olMagic{'dodgeMouse'} = 0;
-
 		$olMagic{'CsSesWin_FS'} = 0;
 		$olMagic{'CsSesWin_Vis'} = 0;
 		$olMagic{'CsSesWin_aX'} = 0;
@@ -568,7 +567,7 @@ sub doOverlayMagic {
 		}
 
 	} elsif ($doWHAT eq "csseswin") {
-
+appDBugLog("WTF:$olMagic{'CsSesWin_FS'} ne $_[1]");
         	if ($olMagic{'CsSesWin_FS'} ne $_[1]) {
 			if ($_[1] eq 1) {
 				$olMagic{'CsSesWin_FS'} = 1;
@@ -658,9 +657,11 @@ sub doOverlayMagic {
 
 	}
 
-	appDBugLog("OVIS: $olMagic{'dodgeMouse'} $olMagic{'onlyaudio'} $olMagic{'SsAppWin_Vis'} $olMagic{'CsSesWin_Vis'} ($olMagic{'visible'})");
+
+
 
 	if (($changeVis eq 1) or ($reTogVis eq 1)) {
+
 		if ($olMagic{'visible'} eq 0) {
 			if ($window->visible) {
 				$window->hide_all;
@@ -671,6 +672,9 @@ sub doOverlayMagic {
 					$window->hide_all;
 				}
 			}
+			if ($olMagic{'CsSesWin_FS'} eq 1) {
+				usleep(200000);
+			}
 			unless ($window->visible) {
 				$window->move($olMagic{'overlay_X'},$olMagic{'overlay_Y'});
 				$window->resize($olMagic{'SsAppWin_Wdt'},$olMagic{'SsAppWin_Hgt'});

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git