diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-02-23 16:00:51 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-02-23 16:00:51 +0000 |
| commit | 239db889b2b9e72b8c8ef1b64e18fe2db659582d (patch) | |
| tree | fb75741b16afc0b6fbf2e285c421f2cdd57eb495 /lib | |
| parent | 7db588f7da78af36dc8d520f9ad4010ebb3f1a81 (diff) | |
| download | ampache-239db889b2b9e72b8c8ef1b64e18fe2db659582d.tar.gz ampache-239db889b2b9e72b8c8ef1b64e18fe2db659582d.tar.bz2 ampache-239db889b2b9e72b8c8ef1b64e18fe2db659582d.zip | |
added b flag to the popen in downsampling
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/update.class.php | 4 | ||||
| -rw-r--r-- | lib/stream.lib.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/class/update.class.php b/lib/class/update.class.php index c27661fc..a2bdf6a2 100644 --- a/lib/class/update.class.php +++ b/lib/class/update.class.php @@ -778,7 +778,7 @@ class Update { $new_prefs[] = array('name' => 'row_color3', 'value' => '#dddddd', 'description' => 'Row Color 3', 'level' => '25', 'locked' => '0', 'type' => 'user'); $new_prefs[] = array('name' => 'error_color', 'value' => '#990033', 'description' => 'Error Color', 'level' => '25', 'locked' => '0', 'type' => 'user'); $new_prefs[] = array('name' => 'font_size', 'value' => '10', 'description' => 'Font Size', 'level' => '25', 'locked' => '0', 'type' => 'user'); - $new_prefs[] = array('name' => 'upload_dir', 'value' => '/tmp', 'description' => 'Upload Directory', 'level' => '25', 'locked' => '0', 'type' => 'user'); + $new_prefs[] = array('name' => 'upload_dir', 'value' => '', 'description' => 'Upload Directory', 'level' => '25', 'locked' => '0', 'type' => 'user'); $new_prefs[] = array('name' => 'sample_rate', 'value' => '32', 'description' => 'Downsample Bitrate', 'level' => '25', 'locked' => '0', 'type' => 'user'); $new_prefs[] = array('name' => 'refresh_limit', 'value' => '0', 'description' => 'Refresh Rate for Homepage', 'level' => '100', 'locked' => '0', 'type' => 'system'); $new_prefs[] = array('name' => 'local_length', 'value' => '900', 'description' => 'Session Expire in Seconds', 'level' => '100', 'locked' => '0', 'type' => 'system'); @@ -1231,7 +1231,7 @@ class Update { $db_results = mysql_query($sql, dbh()); $sql = "INSERT INTO `preferences` ( `id` , `name` , `value` , `description` , `level` , `type` , `locked` )" . - "VALUES ('', 'quarantine_dir', '/tmp', 'Quarantine Directory', '100', 'system', '0')"; + "VALUES ('', 'quarantine_dir', '', 'Quarantine Directory', '100', 'system', '0')"; $db_results = mysql_query($sql, dbh()); /* Since this is a system value we only need to rebuild the -1 users preferences */ diff --git a/lib/stream.lib.php b/lib/stream.lib.php index 4668ee92..37674d7b 100644 --- a/lib/stream.lib.php +++ b/lib/stream.lib.php @@ -250,7 +250,7 @@ function start_downsample($song,$now_playing_id=0,$song_name=0) { log_event($GLOBALS['user']->username,' downsample ',$message); } // if debug - $fp = @popen($downsample_command, 'r'); + $fp = @popen($downsample_command, 'rb'); /* We need more than just the handle here */ $return_array['handle'] = $fp; |