diff options
Diffstat (limited to 'lib/class')
| -rw-r--r-- | lib/class/access.class.php | 2 | ||||
| -rw-r--r-- | lib/class/catalog.class.php | 2 | ||||
| -rw-r--r-- | lib/class/genre.class.php | 2 | ||||
| -rw-r--r-- | lib/class/playlist.class.php | 2 | ||||
| -rw-r--r-- | lib/class/song.class.php | 9 | ||||
| -rw-r--r-- | lib/class/view.class.php | 2 |
6 files changed, 11 insertions, 8 deletions
diff --git a/lib/class/access.class.php b/lib/class/access.class.php index 6e6afbf2..85fc3a81 100644 --- a/lib/class/access.class.php +++ b/lib/class/access.class.php @@ -1,4 +1,4 @@ -<? +<?php /* This program is free software; you can redistribute it and/or diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index 72cdc560..3d9718aa 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -1,4 +1,4 @@ -<? +<?php /* This program is free software; you can redistribute it and/or diff --git a/lib/class/genre.class.php b/lib/class/genre.class.php index 63f15531..dd664c5b 100644 --- a/lib/class/genre.class.php +++ b/lib/class/genre.class.php @@ -1,4 +1,4 @@ -<? +<?php /* Copyright 2001 - 2005 Ampache.org diff --git a/lib/class/playlist.class.php b/lib/class/playlist.class.php index b42ca188..68188d25 100644 --- a/lib/class/playlist.class.php +++ b/lib/class/playlist.class.php @@ -1,4 +1,4 @@ -<? +<?php /* Copyright (c) 2001 - 2005 Ampache.org diff --git a/lib/class/song.class.php b/lib/class/song.class.php index b104a4e2..5363bc43 100644 --- a/lib/class/song.class.php +++ b/lib/class/song.class.php @@ -1,4 +1,4 @@ -<? +<?php /* Copyright (c) 2004 Ampache.org @@ -680,7 +680,6 @@ class Song { @discussion returns true if the $song->type streams ok, false if it must be transcoded to stream */ function native_stream() { - $return = true; switch ($this->type) { //TODO: fill out these cases once we have it working for m4a @@ -688,10 +687,12 @@ class Song { $return = false; break; default: + $return = true; break; } // end switch return $return; + } // end native_stream /*! @@ -699,7 +700,9 @@ class Song { @discussion test if the song type streams natively and if not returns a transcoding command from the config */ function stream_cmd() { - $return = NULL; + + $return = 'downsample_cmd'; + if (!$this->native_stream()) { switch ($this->type) { case "m4a": diff --git a/lib/class/view.class.php b/lib/class/view.class.php index 7d9bf79f..112148ad 100644 --- a/lib/class/view.class.php +++ b/lib/class/view.class.php @@ -1,4 +1,4 @@ -<? +<?php /* Copyright (c) 2004 Ampache.org |