From 4f88fadbc1c508ef40828eaf5920c97681e1fab6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 8 May 2012 18:40:27 +0200
Subject: [PATCH] Add remote for media/tomahawk.php

---
 apps/media/appinfo/app.php | 3 ++-
 apps/media/tomahawk.php    | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index 0ab6543e07..332b73546e 100755
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -32,4 +32,5 @@ OCP\App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
 OCP\App::addNavigationEntry(array('id' => 'media_index', 'order' => 2, 'href' => OCP\Util::linkTo('media', 'index.php'), 'icon' => OCP\Util::imagePath('core', 'places/music.svg'), 'name' => $l->t('Music')));
 
 OC_Search::registerProvider('OC_MediaSearchProvider');
-OCP\CONFIG::setAppValue('core', 'remote_ampache', '/apps/media/remote.php');
\ No newline at end of file
+OCP\CONFIG::setAppValue('core', 'remote_ampache', '/apps/media/remote.php');
+OCP\CONFIG::setAppValue('core', 'remote_tomahawk', '/apps/media/tomahawk.php');
diff --git a/apps/media/tomahawk.php b/apps/media/tomahawk.php
index 700a75bf41..c74d168c42 100755
--- a/apps/media/tomahawk.php
+++ b/apps/media/tomahawk.php
@@ -22,7 +22,6 @@
 */
 
 $_POST=$_GET; //debug
-require_once('../inc.php');
 
 OCP\JSON::checkAppEnabled('media');
 require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');
@@ -58,7 +57,7 @@ $album=OC_MEDIA_COLLECTION::getAlbumId($album,$artist);
 
 $songs=OC_MEDIA_COLLECTION::getSongs($artist,$album,$song);
 
-$baseUrl=OC_Util::getServerURL().OCP\Util::linkTo('media','tomahawk.php');
+$baseUrl=$baseuri;
 
 $results=array();
 foreach($songs as $song) {
@@ -77,4 +76,3 @@ foreach($songs as $song) {
 	);
 }
 OCP\JSON::encodedPrint($results);
-?>