Use a dedicated variable to enable transcode caching

diff --git a/data/config.php.dist b/data/config.php.dist
index 1720268a06edc9338e2f3efca93ccb31d44afea3..3294c49882eb91a6ad88519d8180f3e08d74fb8d 100644 (file)
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -20,7 +20,5 @@ $clientSupport = [
 ];
 
 //if this is set, transcode caching is activated
 ];
 
 //if this is set, transcode caching is activated

-$cacheDir = null;
-//http-accessible cache dir URL
-$cacheDirUrl = null;
+$enableCache = false;

 ?>
 ?>

diff --git a/src/mediatomb.php b/src/mediatomb.php
index 33b9bd87305fbeedf076e65d341c4a3cbd72223e..ffc123a38f621624e365733fee172be5b8813132 100644 (file)
--- a/src/mediatomb.php
+++ b/src/mediatomb.php
@@ -73,7 +73,7 @@ function mediatombAddFile(&$listItems, $item)
     if (!clientSupportsType($di->mimetype)) {
         //client wants transcoded file
         //noxon iRadio cube does not want to play .ogg files
     if (!clientSupportsType($di->mimetype)) {
         //client wants transcoded file
         //noxon iRadio cube does not want to play .ogg files

-        if (isset($GLOBALS['cacheDir']) && $GLOBALS['cacheDir'] != '') {
+        if (isset($GLOBALS['enableCache']) && $GLOBALS['enableCache']) {

             $itemUrl = $host1 . 'transcode-cache.php'
                 . '?url=' . urlencode($itemUrl);
         } else {
             $itemUrl = $host1 . 'transcode-cache.php'
                 . '?url=' . urlencode($itemUrl);
         } else {