diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/catalog.class.php | 6 | ||||
| -rw-r--r-- | lib/class/stream.class.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index e92b1942..61bc19fa 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -1408,7 +1408,7 @@ class Catalog { * clean_playlists * cleans out dead files from playlists */ - public static function clean_playlists($catalog_id) { + public static function clean_playlists() { /* Do a complex delete to get playlist songs where there are no songs */ $sql = "DELETE FROM playlist_data USING playlist_data LEFT JOIN song ON song.id = playlist_data.song WHERE song.file IS NULL"; @@ -1424,7 +1424,7 @@ class Catalog { * clean_ext_info * This function clears any ext_info that no longer has a parent */ - public static function clean_ext_info($catalog_id) { + public static function clean_ext_info() { $sql = "DELETE FROM `song_data` USING `song_data` LEFT JOIN `song` ON `song`.`id` = `song_data`.`song_id` " . "WHERE `song`.`id` IS NULL"; @@ -1436,7 +1436,7 @@ class Catalog { * clean_stats * This functions removes stats for songs/albums that no longer exist */ - public static function clean_stats($catalog_id) { + public static function clean_stats() { // Crazy SQL Mojo to remove stats where there are no songs $sql = "DELETE FROM object_count USING object_count LEFT JOIN song ON song.id=object_count.object_id WHERE object_type='song' AND song.id IS NULL"; diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 2f5c4aee..6fca492c 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -302,7 +302,7 @@ class Stream { /* Add the songs to this new playlist */ foreach ($this->songs as $song_id) { - $tmp_playlist->add_object($song_id); + $tmp_playlist->add_object($song_id,'song'); } // end foreach /* Build the extra info we need to have it pass */ @@ -321,7 +321,7 @@ class Stream { echo "<script language=\"javascript\" type=\"text/javascript\">\n"; echo "<!-- begin\n"; echo "function PlayerPopUp(URL) {\n"; - echo "window.open(URL, 'XSPF_player', 'width=400,height=200,scrollbars=0,toolbar=0,location=0,directories=0,status=0,resizable=0');\n"; + echo "window.open(URL, 'XSPF_player', 'width=400,height=170,scrollbars=0,toolbar=0,location=0,directories=0,status=0,resizable=0');\n"; echo "window.location = '" . return_referer() . "';\n"; echo "return false;\n"; echo "}\n"; |