[X2Go-Commits] [mteleplayer] 15/29: Test basic Id3v2 Album Art support audio files...(needs quite a bit more work)
git-admin at x2go.org
git-admin at x2go.org
Fri Aug 29 21:12:03 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch gzng
in repository mteleplayer.
commit b014e10e313a24e4cfcc944b891447c4d4726301
Author: gznget <opensource at gznianguan.com>
Date: Fri Jul 4 06:43:31 2014 +0200
Test basic Id3v2 Album Art support audio files...(needs quite a bit more work)
---
serverside/bin/mTPAArtExtractor | 17 +++++++++++++++++
serverside/bin/mteleplayer | 16 ++++++++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/serverside/bin/mTPAArtExtractor b/serverside/bin/mTPAArtExtractor
new file mode 100755
index 0000000..f73d5cc
--- /dev/null
+++ b/serverside/bin/mTPAArtExtractor
@@ -0,0 +1,17 @@
+#!/usr/bin/perl
+
+my $inFile = @ARGV[0];
+
+if (-f $inFile) {
+ my $pid = open(EXIF,"-|","/usr/bin/exiftool",'-PICTURE','-b',$inFile);
+ my @EXIF = <EXIF>;
+ close(EXIF);
+
+ if (length("@EXIF") > 1000) {
+ my $outFile = $inFile;
+ $outFile =~ s/\.file\ *$//g;
+ open(CONV,"|-","/usr/bin/convert",'-','-resize','300x300',"$outFile.jpg");
+ print CONV @EXIF;
+ close(CONV);
+ }
+}
diff --git a/serverside/bin/mteleplayer b/serverside/bin/mteleplayer
index 586c73f..0262819 100755
--- a/serverside/bin/mteleplayer
+++ b/serverside/bin/mteleplayer
@@ -526,7 +526,16 @@ sub handleTheLocalSocket {
if ($1 =~ /^ONLYAUDIO\|(\d)\|.*$/) {
if ($1 eq 1) {
$PlayerStatus{'OnylAudio'} = 1;
- $GTKS{'MainMediaEBOXGFX'}->set_from_pixbuf($GTKS{'PixBUF'}{'musicalNote'});
+ my $remoteDir = sanitizeDirPath("$X2GoTKSHome/remote/appData/mteleplayer\_$selfSID");
+print "$remoteDir/$PlayerStatus{'currentMediaID'}.jpg\n";
+ if (-f "$remoteDir/$PlayerStatus{'currentMediaID'}.jpg") {
+ my $AlbumArt = Gtk2::Gdk::Pixbuf->new_from_file("$remoteDir/$PlayerStatus{'currentMediaID'}.jpg") or appDBugLog("Unable to load '$remoteDir/$PlayerStatus{'currentMediaID'}.jpg' to PixBUF... Is it even a GFX file?");
+ if ($AlbumArt) {
+ $GTKS{'MainMediaEBOXGFX'}->set_from_pixbuf($AlbumArt);
+ }
+ } else {
+ $GTKS{'MainMediaEBOXGFX'}->set_from_pixbuf($GTKS{'PixBUF'}{'musicalNote'});
+ }
} else {
$PlayerStatus{'OnylAudio'} = 0;
$GTKS{'MainMediaEBOXGFX'}->set_from_pixbuf($GTKS{'PixBUF'}{'eyesore'});
@@ -772,7 +781,10 @@ sub mtpTeKiRemoteFileSetup {
unless (-l "$remoteDir/$uniqueFileID.file") { # And in the insanely unlikely event that it happends again.. fk it...
symlink($AbsoluteMediaFilePath,"$remoteDir/$uniqueFileID.file");
# Later maybe create a <SAME_UNIQUEID>.info file that cointains Title and other stuff that can make the GUI info etc pre load and look smoother....
- if (-l "$remoteDir/$uniqueFileID.file") {
+ if (-l "$remoteDir/$uniqueFileID.file") {
+ if (($AorV eq "A") and (-x "/usr/bin/mTPAArtExtractor")) {
+ system("/usr/bin/mTPAArtExtractor $remoteDir/$uniqueFileID.file &");
+ }
return $uniqueFileID;
} else {return 0;}
}
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git
More information about the x2go-commits
mailing list