From b51b45952ec140b59348ca26e5d9015025a90f08 Mon Sep 17 00:00:00 2001
From: Paul Arthur <flowerysong00@yahoo.com>
Date: Mon, 14 Jan 2013 17:21:34 -0500
Subject: Some cleanup of the switch in stream.php

Add correct array indices to hand-crafted arrays in single_song and
download cases. Yank unimplemented popular stuff.
---
 stream.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/stream.php b/stream.php
index 2230e9dc..33a4e882 100644
--- a/stream.php
+++ b/stream.php
@@ -75,13 +75,10 @@ switch ($_REQUEST['action']) {
 		} // end switch on type
 	break;
 	case 'single_song':
-		$media_ids[] = array('song',scrub_in($_REQUEST['song_id']));
-	break;
-	case 'your_popular_songs':
-		$media_ids = get_popular_songs($_REQUEST['limit'], 'your', $GLOBALS['user']->id);
-	break;
-	case 'popular_songs':
-		$media_ids = get_popular_songs($_REQUEST['limit'], 'global');
+		$media_ids[] = array(
+			'object_type' => 'song',
+			'object_id' => scrub_in($_REQUEST['song_id'])
+		);
 	break;
 	case 'artist':
 		$artist = new Artist($_REQUEST['artist_id']);
@@ -124,7 +121,10 @@ switch ($_REQUEST['action']) {
 		$urls = array($democratic->play_url());
 	break;
 	case 'download':
-		$media_ids[] = array('song',scrub_in($_REQUEST['song_id']));
+		$media_ids[] = array(
+			'object_type' => 'song',
+			'object_id' => scrub_in($_REQUEST['song_id'])
+		);
 	default:
 	break;
 } // end action switch
-- 
cgit