diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-02-09 16:42:55 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-02-09 16:42:55 +0000 |
| commit | 0d5517d8b8d9d354385b26b05ef7a71d467670d0 (patch) | |
| tree | 4cefd87f215873a79d9966edc605615dd7304e3e | |
| parent | 4bccf5b59561d2a1450e5fecfd4fa436af8f99d4 (diff) | |
| download | ampache-0d5517d8b8d9d354385b26b05ef7a71d467670d0.tar.gz ampache-0d5517d8b8d9d354385b26b05ef7a71d467670d0.tar.bz2 ampache-0d5517d8b8d9d354385b26b05ef7a71d467670d0.zip | |
tweaked some stuff
| -rw-r--r-- | config/ampache.cfg.php.dist | 11 | ||||
| -rw-r--r-- | install.php | 2 | ||||
| -rw-r--r-- | lib/class/song.class.php | 8 |
3 files changed, 18 insertions, 3 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist index f9d7647d..db05eee9 100644 --- a/config/ampache.cfg.php.dist +++ b/config/ampache.cfg.php.dist @@ -412,7 +412,16 @@ downsample_cmd = mp3splt -qnf %FILE% %OFFSET% %EOF% -o - | lame --mp3input -q 3 # formats to mp3 for streaming. Very similar to # downsampling, but requires something that can play # the various file formats. -stream_cmd_m4a = faad -f 2 -w "%FILE%" | lame -r -b %SAMPLE% -S - - + +# List of filetypes to transcode +transcode_m4a = true +#transcode_flac = false +#transcode_mpc = false + +# These are the commands that will be run to transcode the file +#stream_cmd_flac = +#stream_cmd_m4a = faad -f 2 -w "%FILE%" | lame -r -b %SAMPLE% -S - - +#stream_cmd_mpc = ####################################################### # These options control the "local play" feature. This requires diff --git a/install.php b/install.php index fab6e5a2..c699c84c 100644 --- a/install.php +++ b/install.php @@ -25,7 +25,7 @@ error_reporting(E_ALL ^ E_NOTICE); require_once('lib/general.lib.php'); require_once('lib/ui.lib.php'); -require_once('lib/Browser.php'); +require_once('modules/horde/Browser.php'); require_once('lib/install.php'); require_once('modules/lib.php'); require_once('lib/debug.php'); diff --git a/lib/class/song.class.php b/lib/class/song.class.php index c08594de..44ce9602 100644 --- a/lib/class/song.class.php +++ b/lib/class/song.class.php @@ -698,7 +698,13 @@ class Song { switch ($this->type) { //TODO: fill out these cases once we have it working for m4a case "m4a": - $return = false; + $return = conf('transcode_m4a'); + break; + case 'flac': + $return = conf('transcode_flac'); + break; + case 'mpc': + $return = conf('transcode_mpc'); break; default: $return = true; |