[X2Go-Commits] [mteleplayer] 02/02: Media area GFX changes depending on state and media type.
git-admin at x2go.org
git-admin at x2go.org
Thu Jul 3 21:25:16 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 8aa50b68a198d4d125ce8c85b692245ce08d5330
Author: gznget <opensource at gznianguan.com>
Date: Thu Jul 3 02:31:13 2014 +0200
Media area GFX changes depending on state and media type.
---
.../mteleplayer/bin/mteleplayer_clientside | 36 +++++++++-----------
serverside/bin/mteleplayer | 14 ++++++--
2 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside
index 3486e84..8594ee0 100755
--- a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside
+++ b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside
@@ -325,11 +325,11 @@ if ($1 =~ /^MPCMD\|PLAYMEDIA\|([0-9a-zA-Z]{24,64})\|([A-Z]{3,4})\|(\d*)\|(\d*)\|
}
-if ($1 =~ /^MPCMD\|STOP\|/) {
- mpCMD("pausing loadfile $theSHAREDIR/blk.mpg");
- mpCMD("pause");
- $window->hide_all();
-}
+#if ($1 =~ /^MPCMD\|STOP\|/) {
+# mpCMD("pausing loadfile $theSHAREDIR/blk.mpg");
+# mpCMD("pause");
+# $window->hide_all();
+#}
} elsif ($saneData =~ /^CORE\|SERVICES\|X2GOWINDOWSTATE\|(\d)\|(\d)\|(\d*)\|(\d*)\|(\d*)\|(\d*)\|/) {
#print "CORE CHANGE $1\n";
my $retogglevis = 0;
@@ -534,8 +534,6 @@ sub watch_mplayerOutput {
#############################
} elsif ($line =~ /^Playing(.*)$/) {
appDBugLog("SET X:$1:X");
- if ($1 =~ /mteleplayer\/blk\.mpg\.$/) {$mediaINFO{'AXEPTINFO'} = 0;}
- else {$mediaINFO{'AXEPTINFO'} = 1;}
} elsif (($line =~ /======================================/) and ($mediaINFO{'MEDIAINFOSET'} ne 1)) {
appDBugLog("SET STATUS!");
setMediaInfo(1);# Trigger setMediaInfo DONE...
@@ -603,24 +601,24 @@ sub setMediaInfo {
$mediaINFO{'ONLYAUDIO'} = 0;
$mediaINFO{'MEDIAINFOSET'} = 0;
} elsif ($_[0] eq 1) {
- appDBugLog("SET setMediaINFO STEP 1");
+ appDBugLog("SET setMediaINFO:");
foreach my $key (keys %mediaINFO) {
appDBugLog("SET\t$key $mediaINFO{$key}");
}
- unless ($mediaINFO{'FILENAME'} =~ /mteleplayer\/blk\.mpg$/) {
- if ($mediaINFO{'VIDEOFORMAT'}) {$mediaINFO{'ONLYAUDIO'} = 1;}
- $mpState{'mediaLength'} = $mediaINFO{'LENGHT'};
- if ($mediaINFO{'VIDEOFORMAT'} eq 0) {
+
+ if ($mediaINFO{'VIDEOFORMAT'} eq 0) {
+ $mediaINFO{'ONLYAUDIO'} = 1;
+ appCOM("ONLYAUDIO|1|");
$mpState{'noshow'} = 1;
- } else {
- $mpState{'noshow'} = 0;
- }
-
- doReportTimePos("0.00",$mpState{'mediaLength'});
- $mediaINFO{'MEDIAINFOSET'} = 1;
} else {
-# setMediaInfo(0);
+ appCOM("ONLYAUDIO|0|");
+ $mpState{'noshow'} = 0;
}
+ $mpState{'mediaLength'} = $mediaINFO{'LENGHT'};
+ doReportTimePos("0.00",$mpState{'mediaLength'});
+
+ $mediaINFO{'MEDIAINFOSET'} = 1;
+
overlayStateChange();
} elsif ((uc($_[0]) =~ /^([A-Z]{3,})$/) and (length($_[1]) > 0)) {
$mediaINFO{$1} = $_[1];
diff --git a/serverside/bin/mteleplayer b/serverside/bin/mteleplayer
index fb455f7..586c73f 100755
--- a/serverside/bin/mteleplayer
+++ b/serverside/bin/mteleplayer
@@ -76,7 +76,7 @@ our %sstatusi;$sstatusi{'sockState'} = 0;$sstatusi{'sockRetryCnt'} = 0;$sstatusi
$sstatusi{'lastCOMtime'} = (time()+2);$sstatusi{'remoteInitCnt'} = 0;
my %PlayerStatus;$PlayerStatus{'timePos'} = 0;$PlayerStatus{'timeLength'} = 0;$PlayerStatus{'paused'} = 0;$PlayerStatus{'stoped'} = 0;$PlayerStatus{'muted'} = 0;$PlayerStatus{'volume'} = 100;$PlayerStatus{'caching'} = 0;
- $PlayerStatus{'seekTimeLag'} = 0;$PlayerStatus{'initialMediaID'} = 0;$PlayerStatus{'fullscreen'} = 0;
+ $PlayerStatus{'seekTimeLag'} = 0;$PlayerStatus{'initialMediaID'} = 0;$PlayerStatus{'fullscreen'} = 0;$PlayerStatus{'OnylAudio'} = 0;
$PlayerStatus{'theOpenerDir'} = setOpenerDir(0);
our ($UserName,$UserHome,$X2GoSID,$X2GoSesHome,$X2GoTKSHome,$TeKiLSockPath) = getBasicServersideInfo();
my $LocalSocket;
@@ -522,6 +522,16 @@ sub handleTheLocalSocket {
toggleBLACKOUT(0);
appCOM("SUP");
}
+
+ if ($1 =~ /^ONLYAUDIO\|(\d)\|.*$/) {
+ if ($1 eq 1) {
+ $PlayerStatus{'OnylAudio'} = 1;
+ $GTKS{'MainMediaEBOXGFX'}->set_from_pixbuf($GTKS{'PixBUF'}{'musicalNote'});
+ } else {
+ $PlayerStatus{'OnylAudio'} = 0;
+ $GTKS{'MainMediaEBOXGFX'}->set_from_pixbuf($GTKS{'PixBUF'}{'eyesore'});
+ }
+ }
if ($1 =~ /^CACHING\|([\d\.\%]*)\|.*/) {
$GTKS{'INFO'}{'PLYRSTAT'}{'LABEL'}->set_text("Caching Media: $1%");
@@ -543,7 +553,7 @@ sub handleTheLocalSocket {
if ($PlayerStatus{'caching'} eq 1) {
$PlayerStatus{'caching'} = 0;
$GTKS{'INFO'}{'PLYRSTAT'}{'EBOX'}->hide_all;
- $GTKS{'MainMediaEBOXGFX'}->set_from_pixbuf($GTKS{'PixBUF'}{'eyesore'});
+# $GTKS{'MainMediaEBOXGFX'}->set_from_pixbuf($GTKS{'PixBUF'}{'eyesore'});
}
doUpdateTimeLine($1,$2);
$PlayerStatus{'currentMediaSeek'} = $1;
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git
More information about the x2go-commits
mailing list