aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* pcm_utils: support any number of channels in pcm_sizeOfConvBuffer()Max Kellermann2008-10-121-11/+2
| | | | | When calculating the conversion buffer size, don't hard-code the formulas for only mono<->stereo.
* pcm_utils: support converting N channels to stereoMax Kellermann2008-10-121-0/+26
| | | | | | | Convert any number of channels to stereo. In fact, this isn't really stereo, it's rater mono blown up to stereo. This patch should only make it possible to play 5.1 files at all; "real" conversion to stereo should be implemented, but for now, this is better than nothing.
* pcm_utils: pass output channel count to pcm_convertChannels()Max Kellermann2008-10-121-35/+22
| | | | | | In order to be able to deal with non-trivial conversions, pcm_convertChannels() needs to know both the input and the output channel count. Simplify buffer allocation in that function.
* pcm_utils: moved code from pcm_convertChannels() to separate functionsMax Kellermann2008-10-121-20/+32
| | | | | | | Moved code from pcm_convertChannels() to pcm_convert_channels_1_to_2() and pcm_convert_channels_2_to_1(). Improved the quality of pcm_convert_channels_2_to_1() by calculating the arithmetic mean value of both samples.
* alsa: moved code to alsa_configure()Max Kellermann2008-10-121-13/+18
| | | | | Move code which loads configuration to alsa_configure(). This removes one indent level.
* pcm_utils: pass int16_t* where appropriateMax Kellermann2008-10-121-12/+15
| | | | | Pass int16_t pointers instead of char pointers to functions which can deal with 16 bit audio only.
* player: replaced buffered_before_play with buffering flagMax Kellermann2008-10-121-9/+10
| | | | | | buffered_before_play was copied to struct player because it was used to disable buffering when seeking. Instead of mainaining a copy of this number, move just the flag to the player struct.
* audio: renamed the audio_format variablesMax Kellermann2008-10-121-17/+13
| | | | | | Renamed audio_configFormat to configured_audio_format. Renamed audio_buffer.format to input_audio_format. Simplified its initialization in openAudioDevice().
* audio: removed enum ad_stateMax Kellermann2008-10-121-22/+14
| | | | | All what's left from ad_state is a simple boolean flag (ENABLE / DISABLE). Convert it to a C99 bool.
* audio: removed audio_buffer.bufferMax Kellermann2008-10-121-69/+2
| | | | | | audio.c maintained one of MPD's many layers of audio buffers. It was without any benefit, since playAudio() can simply send the source buffer directly to the audio output plugin.
* output_buffer: converted ob_is_empty() to inlineMax Kellermann2008-10-122-6/+4
| | | | | The function ob_is_empty() is called very often. It's worth it to convert it to an inline function.
* player: added commands QUEUE and CANCELMax Kellermann2008-10-124-155/+74
| | | | | | QUEUE adds a new song to the player's queue. CANCEL clears the queue. These two commands replace the old and complex queueState and queueLockState code.
* playlist: call clearPlayerQueue() only if song is queuedMax Kellermann2008-10-121-23/+15
| | | | | | Simplify and merge several if clauses before the clearPlayerQueue() invocation. Call clearPlayerQueue() only if a song is actually queued; add an assertion for that in clearPlayerQueue().
* player: added struct playerMax Kellermann2008-10-121-48/+75
| | | | | The player struct holds the local variables which used to be passed to all those helper functions in player_thread.c.
* player: removed set_current_song()Max Kellermann2008-10-111-13/+5
| | | | | set_current_song() is an internal function and consists of only one assignment. Eliminate it.
* player: removed player_control.fileTimeMax Kellermann2008-10-113-3/+2
| | | | | | | This variable is superfluous, it is only used to copy its value to player_control.totalTime. Since the original source of this value (song->tag->time) will still be available at this point, we can safely remove fileTime.
* alsa: don't override libasound's buffer_time and period_timeMax Kellermann2008-10-111-20/+19
| | | | | ALSA does a good job measuring its buffer_time and period_time. Don't override its defaults, unless the user demands it.
* alsa: re-enable blocking modeMax Kellermann2008-10-111-15/+2
| | | | | | | | Revert e4f5d6bd "re-enable-nonblocking, but sleep if busy". Non-blocking mode with manual sleeping doesn't help at all (by the way, the patch should have used snd_pcm_wait() instead of my_usleep()). ALSA knows much more about the hardware quirks, so we just let it do the job.
* oss: fix opening default OSS deviceMax Kellermann2008-10-111-1/+1
| | | | | | Leftover from the output API changes: oss_open_default() was changed to return a void*, but it still returned "0" to report success. Report the OssData pointer instead.
* player: don't wake up decoder after every frameMax Kellermann2008-10-101-1/+7
| | | | | | | The decoder was woken up after each chunk which had been played. That caused a lot of superfluous context switches. Wake up the decoder only when a certain amount of the buffer has been consumed. This formula is somewhat arbitrary, and has to be proven experimentally.
* mp3: dither an arbitrary number of channelsMax Kellermann2008-10-101-6/+3
| | | | | | | | The mp3 plugin did not use the MAD_NCHANNELS() value correctly: when a stream was not stereo, it was assumed to be mono, although the correct number was passed to MPD. libmad doesn't support more than 2 channels, but this change allows gcc to optimize its inlining strategy.
* mp3: hard-code dithering to 16 bitsMax Kellermann2008-10-101-8/+6
| | | | | | The dithering function audio_linear_dither() worked for signed 16 bits only anyway, having a variable "bits" just disables important gcc optimizations.
* player: added player_get_audio_format()Max Kellermann2008-10-103-22/+8
| | | | | player_get_audio_format() replaces getPlayerSampleRate(), getPlayerBits(), getPlayerChannels().
* player: added player_control.audio_formatMax Kellermann2008-10-104-17/+12
| | | | This replaces the attributes bits, channels, sampleRate.
* mvp: unsinged integersMax Kellermann2008-10-101-4/+5
| | | | | | Fix some gcc warnings by using unsigned where appropriate. Declare numfrequencies as "const", and replaced the magic number 12 with a sizeof.
* mvp: adapt to the new output device APIMax Kellermann2008-10-101-20/+21
|
* mvp: missing includesMax Kellermann2008-10-101-0/+5
| | | | | Again, a plugin which was disabled in my test environment and suffered from compilation errors.
* oss: added OssData.audio_formatMax Kellermann2008-10-101-19/+20
| | | | This replaces the separate properties channels, sampleRate, bits.
* audio_format: added audio_format_frame_size()Max Kellermann2008-10-105-7/+12
| | | | | | | A frame contains one sample per channel, thus it is sample_size * channels. This patch includes some cleanup for various locations where the sample size for 24 bit audio was still 3 bytes (instead of 4).
* audio_format: renamed sampleRate to sample_rateMax Kellermann2008-10-1027-97/+96
| | | | | The last bit of CamelCase in audio_format.h. Additionally, rename a bunch of local variables.
* audio_format: unsigned integersMax Kellermann2008-10-106-15/+15
| | | | "bits" and "channels" cannot be negative.
* update: replaced update_return with global "modified" flagMax Kellermann2008-10-091-65/+41
| | | | | | | There is only once update thread at a time. Make the "modified" flag global and remove the return values of most functions. Propagating an error is only useful for updateDirectory(), since updateInDirectory() will delete failed subdirectories.
* update: make the variable "progress" staticMax Kellermann2008-10-091-1/+1
|
* update: don't print debug message when song was not modifiedMax Kellermann2008-10-091-4/+5
| | | | | When a song file was not modified, MPD printed the debug message "not a directory or music", because the first "if" branch did not return.
* update: fix memory leak in directory_update_init()Max Kellermann2008-10-091-1/+4
| | | | | When the update queue is full, directory_update_init() did not free the path argument.
* update: make the job id unsignedMax Kellermann2008-10-094-9/+13
| | | | Since the return value cannot be -1 anymore, we can make it unsigned.
* update: job ID must be positiveMax Kellermann2008-10-094-20/+16
| | | | | | | The documentation for directory_update_init() was incorrect: a job ID must be positive, not non-negative. If the update queue is full and no job was created, it makes more sense to return 0 instead of -1, because it is more consistent with the return value of isUpdatingDB().
* update: check progress!=IDLE in reap_update_task()Max Kellermann2008-10-091-0/+3
| | | | | When the update task is idle, there is no need to check for deleted songs. Return early from reap_update_task().
* update: fixed stack corruption due to pthread_join() callMax Kellermann2008-10-091-1/+3
| | | | | | pthread_join() expects a "pointer to a pointer" parameter, but it got a "pointer to an enum". On AMD64, an enum is smaller than a pointer, leading to a buffer overflow.
* updated: always call removeDeletedFromDirectory()Max Kellermann2008-10-091-3/+1
| | | | | Removed the local variable "was_empty": don't remember if the directory is new. Always call removeDeletedFromDirectory().
* update: eliminated addSubDirectoryToDirectory()Max Kellermann2008-10-091-27/+8
| | | | | | In updateInDirectory(), add new directories immediately and delete them when they turn out to be empty. This simplifies the code and allows us to eliminate addSubDirectoryToDirectory().
* update: make the "song" variable more localMax Kellermann2008-10-091-3/+2
|
* update: do the recursive directory check only onceMax Kellermann2008-10-091-8/+6
| | | | | The recursive checks were performed in several functions, and sometimes a directory was checked twice.
* update: copy stat to new directoryMax Kellermann2008-10-091-1/+3
| | | | | | When reading a new directory, copy the stat data (which we have anyway) to the directory struct. This may save a stat() in the future.
* update: avoid duplicate stat() callsMax Kellermann2008-10-091-27/+35
| | | | Pass a pointer to the stat struct to more functions.
* update: rewrote updatePath() using updateInDirectory()Max Kellermann2008-10-091-68/+21
| | | | | | updatePath() duplicated a lot of code from the more generic updateInDirectory(). Eliminate most of updatePath() and call updateInDirectory().
* update: don't export updateDirectory()Max Kellermann2008-10-094-14/+25
| | | | | | | | If the user requests database update during startup, call directory_update_init(). This should be changed to fully asynchronous update later. For this to work, main_notify has to be initialized before db_init().
* update: pass const pointer to addSubDirectoryToDirectory()Max Kellermann2008-10-091-1/+1
| | | | The stat struct isn't going to be modified, make it const.
* update: never pass root path to updatePath()Max Kellermann2008-10-091-6/+1
| | | | | update_task() already checks if it has got a root path. Extend this check and in turn remove a check in the inner function updatePath().
* database: renamed get_get_song() to db_get_song()Max Kellermann2008-10-095-8/+8
| | | | Search'n'replace typo..
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 12:33:31 +0000