X-Git-Url: https://git.cweiske.de/noxon-gateway.git/blobdiff_plain/daeda7055cd10cc88ca0966c8791c1c001e4e30f..3d4549c48e912539390289eeb5c4e20df0b3278c:/src/mediatomb.php?ds=sidebyside

diff --git a/src/mediatomb.php b/src/mediatomb.php
index 11ffe5a..e582a46 100644
--- a/src/mediatomb.php
+++ b/src/mediatomb.php
@@ -26,9 +26,8 @@ function handleRequestMediatomb($fullPath, $prefix)
             $itemUrl = $item->url;
             if ($di->mimetype !== 'audio/mpeg') {
                 //noxon iRadio cube does not want to play .ogg files
-                $itemUrl = $host1 . 'transcode'
-                    . '?mtParentId=' . $container->id
-                    . '&mtItemTitle=' . urlencode($item->title);
+                $itemUrl = $host1 . 'transcode-nocache.php'
+                    . '?url=' . urlencode($itemUrl);
             }
             $listItems[] = getEpisodeItem(
                 $item->title,
@@ -44,66 +43,4 @@ function handleRequestMediatomb($fullPath, $prefix)
 
     sendListItems($listItems);
 }
-
-function transcodeMediatombItem($parentId, $title)
-{
-    global $mediatomb, $host1, $cacheDir, $cacheDirUrl;
-
-    if (!is_writable($cacheDir)) {
-        sendMessage('Cache dir not writable');
-        return;
-    }
-
-    extract($mediatomb);
-    try {
-        $smt = new Services_MediaTomb($user, $pass, $host, $port);
-        $item = $smt->getSingleItem((int) $parentId, $title, false);
-
-        $filename = $item->id . '.mp3';
-        $cacheFilePath = $cacheDir . $filename;
-        if (!file_exists($cacheFilePath)) {
-            transcodeUrlToMp3($item->url, $cacheFilePath);
-        }
-        if (!file_exists($cacheFilePath)) {
-            sendMessage('Error: No mp3 file found');
-            return;
-        }
-        $cacheFileUrl = $cacheDirUrl . $filename;
-        header('Location: ' . $cacheFileUrl);
-    } catch (Exception $e) {
-        sendMessage('Mediatomb error: ' . $e->getMessage());
-    }
-}
-
-function transcodeUrlToMp3($url, $mp3CacheFilePath)
-{
-    $tmpfile = tempnam(sys_get_temp_dir(), 'transcode');
-    exec(
-        'wget --quiet '
-        . escapeshellarg($url)
-        . ' -O ' . escapeshellarg($tmpfile),
-        $output,
-        $retval
-    );
-    if ($retval !== 0) {
-        throw new Exception('Error downloading URL');
-    }
-
-    exec(
-        'ffmpeg'
-        . ' -i ' . escapeshellarg($tmpfile)
-        . ' ' . escapeshellarg($mp3CacheFilePath)
-        . ' 2>&1',
-        $output,
-        $retval
-    );
-    unlink($tmpfile);
-    if ($retval !== 0) {
-        if (file_exists($mp3CacheFilePath)) {
-            unlink($mp3CacheFilePath);
-        }
-        //var_dump($tmpfile, $output);
-        throw new Exception('Error transcoding file');
-    }
-}
 ?>