summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-11-12 07:36:52 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-11-12 07:36:52 +0000
commitf435ca753c1d6ce8f657c3374ae71daec6daf2be (patch)
tree47fcefdbfb3b3ffd71c8bc27b35af0255df62e83 /config
parent7b303176665062673f07f451ddbf571f8a2c3c80 (diff)
downloadampache-f435ca753c1d6ce8f657c3374ae71daec6daf2be.tar.gz
ampache-f435ca753c1d6ce8f657c3374ae71daec6daf2be.tar.bz2
ampache-f435ca753c1d6ce8f657c3374ae71daec6daf2be.zip
more democratic play work, still not working going to need db change to make it work how I want, will do later
Diffstat (limited to 'config')
-rw-r--r--config/ampache.cfg.php.dist17
1 files changed, 7 insertions, 10 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist
index 23703b93..ce70c9da 100644
--- a/config/ampache.cfg.php.dist
+++ b/config/ampache.cfg.php.dist
@@ -116,8 +116,8 @@ require_session = "true"
; Downsample Remote
; If this is set to true and access control is on any users who are not
-; coming from a defined localnet will be automatically downsampled
-; regardless of their preferences
+; coming from a defined 'network' ACL will be automatically downsampled
+; regardless of their preferences. Requires access_control to be enabled
; DEFAULT: false
;downsample_remote = "false"
@@ -449,15 +449,12 @@ search_type = fuzzy
;######################################################
; These are commands used to transcode non-streaming
-; formats to the target file type for streaming. Any
-; file types defined here will automatically be transcoded
-; using the stream_cmd_??? regardless of personal preferences
+; formats to the target file type for streaming.
; This can be useful in re-encoding file types that don't stream
-; very well, or if the player doesn't support some file types.
-; This is also the string used when 'downsampling' is selected
-;
+; very well, or if your player doesn't support some file types.
+; This is also the string used when 'downsampling' is selected
; REQUIRED variables
-; transcode_TYPE = true/false ## True if you want to force transcode
+; transcode_TYPE = true/false ## True to force transcode regardless of prefs
; transcode_TYPE_target = TARGET_FILE_TYPE
; transcode_cmd_TYPE = TRANSCODE_COMMAND
; %FILE% = filename
@@ -465,7 +462,6 @@ search_type = fuzzy
; %SAMPLE% = sample rate
; %EOF% = end of file in min.sec
-
; List of filetypes to transcode
transcode_m4a = true
transcode_m4a_target = mp3
@@ -478,6 +474,7 @@ transcode_mp3_target = mp3
transcode_cmd_flac = "flac -dc %FILE% | lame -r -b 128 -S - - "
transcode_cmd_m4a = "faad -f 2 -w %FILE% | lame -r -b 128 -S - -"
transcode_cmd_mp3 = "mp3splt -qnf %FILE% %OFFSET% %EOF% -o - | lame --mp3input -q 3 -b %SAMPLE% -S - -"
+
# This line seems to work better for windows, switch if needed
#transcode_cmd_mp3 = "mp3splt -qnf -o - %FILE% %OFFSET% %EOF% | lame --mp3input -q 3 -b %SAMPLE% -S - -"