| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
| |
When calculating the conversion buffer size, don't hard-code the
formulas for only mono<->stereo.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Move code which loads configuration to alsa_configure(). This removes
one indent level.
|
|
|
|
|
| |
Pass int16_t pointers instead of char pointers to functions which can
deal with 16 bit audio only.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
Renamed audio_configFormat to configured_audio_format. Renamed
audio_buffer.format to input_audio_format. Simplified its
initialization in openAudioDevice().
|
|
|
|
|
| |
All what's left from ad_state is a simple boolean flag (ENABLE /
DISABLE). Convert it to a C99 bool.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
The function ob_is_empty() is called very often. It's worth it to
convert it to an inline function.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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().
|
|
|
|
|
| |
The player struct holds the local variables which used to be passed to
all those helper functions in player_thread.c.
|
|
|
|
|
| |
set_current_song() is an internal function and consists of only one
assignment. Eliminate it.
|
|
|
|
|
|
|
| |
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 does a good job measuring its buffer_time and period_time. Don't
override its defaults, unless the user demands it.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
The dithering function audio_linear_dither() worked for signed 16 bits
only anyway, having a variable "bits" just disables important gcc
optimizations.
|
|
|
|
|
| |
player_get_audio_format() replaces getPlayerSampleRate(),
getPlayerBits(), getPlayerChannels().
|
|
|
|
| |
This replaces the attributes bits, channels, sampleRate.
|
|
|
|
|
|
| |
Fix some gcc warnings by using unsigned where appropriate. Declare
numfrequencies as "const", and replaced the magic number 12 with a
sizeof.
|
| |
|
|
|
|
|
| |
Again, a plugin which was disabled in my test environment and suffered
from compilation errors.
|
|
|
|
| |
This replaces the separate properties channels, sampleRate, bits.
|
|
|
|
|
|
|
| |
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).
|
|
|
|
|
| |
The last bit of CamelCase in audio_format.h. Additionally, rename a
bunch of local variables.
|
|
|
|
| |
"bits" and "channels" cannot be negative.
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
When the update queue is full, directory_update_init() did not free
the path argument.
|
|
|
|
| |
Since the return value cannot be -1 anymore, we can make it unsigned.
|
|
|
|
|
|
|
| |
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().
|
|
|
|
|
| |
When the update task is idle, there is no need to check for deleted
songs. Return early from reap_update_task().
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Removed the local variable "was_empty": don't remember if the
directory is new. Always call removeDeletedFromDirectory().
|
|
|
|
|
|
| |
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().
|
| |
|
|
|
|
|
| |
The recursive checks were performed in several functions, and
sometimes a directory was checked twice.
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
Pass a pointer to the stat struct to more functions.
|
|
|
|
|
|
| |
updatePath() duplicated a lot of code from the more generic
updateInDirectory(). Eliminate most of updatePath() and call
updateInDirectory().
|
|
|
|
|
|
|
|
| |
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().
|
|
|
|
| |
The stat struct isn't going to be modified, make it const.
|
|
|
|
|
| |
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().
|
|
|
|
| |
Search'n'replace typo..
|