From e46b19547e7d16999b05577ec64631cc12796355 Mon Sep 17 00:00:00 2001
From: xgizzmo <xgizzmo@ampache>
Date: Sun, 29 Jul 2007 21:21:32 +0000
Subject: Replace references to old code with new code

---
 lib/class/genre.class.php | 4 ++--
 lib/general.lib.php       | 2 +-
 lib/rss.php               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/class/genre.class.php b/lib/class/genre.class.php
index 64a44b96..a37c449e 100644
--- a/lib/class/genre.class.php
+++ b/lib/class/genre.class.php
@@ -67,8 +67,8 @@ class Genre {
 
 		$this->f_link 		= "<a href=\"" . Config::get('web_path') . "/genre.php?action=show_genre&amp;genre_id=" . $this->id . "\">" . scrub_out($this->name) . "</a>";
 		
-		$this->play_link 	= Config::get('web_path') . '/song.php?action=genre&amp;genre=' . $this->id;
-		$this->random_link 	= Config::get('web_path') . '/song.php?action=random_genre&amp;genre=' . $this->id; 
+		$this->play_link 	= Config::get('web_path') . '/stream.php?action=genre&amp;genre=' . $this->id;
+		$this->random_link 	= Config::get('web_path') . '/stream.php?action=random_genre&amp;genre=' . $this->id; 
 		$this->download_link 	= Config::get('web_path') . '/batch.php?action=genre&amp;id=' . $this->id;
 		
 	} // format
diff --git a/lib/general.lib.php b/lib/general.lib.php
index 65422c48..ea1556d3 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -452,7 +452,7 @@ function get_global_popular($type) {
 			$song->format();
                         $text = "$song->f_artist_full - $song->title";
                         /* Add to array */
-                        $song->link = "<a href=\"$web_path/song.php?action=single_song&amp;song_id=$song->id\" title=\"". scrub_out($text) ."\">" .
+                        $song->link = "<a href=\"$web_path/stream.php?action=single_song&amp;song_id=$song->id\" title=\"". scrub_out($text) ."\">" .
 	                           	scrub_out(truncate_with_ellipsis($text, Config::get('ellipsis_threshold_title')+3)) . "&nbsp;(" . $r['count'] . ")</a>";
 			$items[] = $song;
                 } // if it's a song
diff --git a/lib/rss.php b/lib/rss.php
index fdcac5e7..cfce735d 100644
--- a/lib/rss.php
+++ b/lib/rss.php
@@ -119,7 +119,7 @@ switch ($type) {
                 $song   = new Song($r->object_id);
 		$artist = $song->get_artist_name();
  		echo " <title><![CDATA[$artist - $song->title ($r->count)]]></title>\n";
- 		echo " <link>$web_path/song.php?action=single_song&amp;song_id=$r->object_id</link>\n";
+ 		echo " <link>$web_path/stream.php?action=single_song&amp;song_id=$r->object_id</link>\n";
  		echo " <description><![CDATA[$artist - $song->title ($r->count)]]></description>\n";
  		echo "</item>\n";
         }
@@ -204,7 +204,7 @@ switch ($type) {
 		$user = new User($item['user']);
 		$user->format_user();
  		echo " <title><![CDATA[$song->title]]></title>\n";
- 		echo " <link>$web_path/song.php?action=single_song&amp;song_id=".$item['object_id']."</link>\n";
+ 		echo " <link>$web_path/stream.php?action=single_song&amp;song_id=".$item['object_id']."</link>\n";
  		echo " <description><![CDATA[$user->fullname played $song->title - $song->f_artist $time_string]]></description>\n";
  		echo "</item>\n";
 	}
-- 
cgit