From cc5a2b549ef0f2142431b57c0f08144e5fd7928e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 5 Apr 2016 15:58:12 +0200
Subject: [PATCH] Replace getid3 with ID3Parser

---
 3rdparty                    |  2 +-
 lib/private/preview/mp3.php | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/3rdparty b/3rdparty
index 35a8125ac1..de4313cda7 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 35a8125ac1dc2325da8da5529f50b3881e1b2402
+Subproject commit de4313cda759a88745fbc5b5aaaca5e3644b361f
diff --git a/lib/private/preview/mp3.php b/lib/private/preview/mp3.php
index b984cb4e10..c7b70457af 100644
--- a/lib/private/preview/mp3.php
+++ b/lib/private/preview/mp3.php
@@ -23,6 +23,8 @@
  */
 namespace OC\Preview;
 
+use ID3Parser\ID3Parser;
+
 class MP3 extends Provider {
 	/**
 	 * {@inheritDoc}
@@ -35,15 +37,17 @@ class MP3 extends Provider {
 	 * {@inheritDoc}
 	 */
 	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		$getID3 = new \getID3();
+		$getID3 = new ID3Parser();
 
 		$tmpPath = $fileview->toTmpFile($path);
-
 		$tags = $getID3->analyze($tmpPath);
-		\getid3_lib::CopyTagsToComments($tags);
-		if(isset($tags['id3v2']['APIC'][0]['data'])) {
-			$picture = @$tags['id3v2']['APIC'][0]['data'];
-			unlink($tmpPath);
+		unlink($tmpPath);
+		$picture = isset($tags['id3v2']['APIC'][0]['data']) ? $tags['id3v2']['APIC'][0]['data'] : null;
+		if(is_null($picture) && isset($tags['id3v2']['PIC'][0]['data'])) {
+			$picture = $tags['id3v2']['PIC'][0]['data'];
+		}
+
+		if(!is_null($picture)) {
 			$image = new \OC_Image();
 			$image->loadFromData($picture);