aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* pulse_mixer: return if mixer is offlineMax Kellermann2009-03-271-29/+27
| | | | | Eliminate one indent level. Also remove several debug useless debug messages.
* pulse_mixer: removed superfluous G_GNUC_UNUSED attributesMax Kellermann2009-03-271-4/+4
| | | | Those parameters are used after all.
* pulse_mixer: use local pa_cvolume variable for set_volume()Max Kellermann2009-03-271-2/+3
| | | | | | Don't mess with pulse_mixer.volume for setting the volume. This variable should only be used to transfer the current volume from sink_input_vol() to pulse_mixer_get_volume().
* pulse_mixer: wait for get_volume() operation to completeMax Kellermann2009-03-271-1/+34
| | | | | | | | | | The pa_context_get_sink_input_info() function is asynchronous, and after it returns, libpulse does not guarantee that the operation has completed yet; in fact, it is not likely. Explicitly wait for the operation to complete. The code for the new pulse_wait_for_operation() function was inspired by mplayer and xine code.
* mixer_control: don't lock the mutex twice in mixer_failed()Max Kellermann2009-03-271-5/+14
| | | | | | The function mixer_failed() expects the mixer mutex to be already locked, yet it calls mixer_close(), which attempts to lock the mutex again, deadlocking itself.
* renamed smartstop to single and changed behaviorRomain Bignon2009-03-277-29/+43
| | | | | When single mode is enabled, after current song it stops playback, or it replay same song if repeat mode is activated.
* implements the smartstop featureRomain Bignon2009-03-277-2/+66
| | | | | | | | | The smartstop feature is a way to tell mpd to stop playing after current song. This patche provides: - 'state' command returns 'smartstop' state (1 or 0) - 'smartstop' can activate or not the smartstop state - when song is terminated, mpd stops playing and smartstop is set to 0
* pulse_mixer: adapted code styleMax Kellermann2009-03-271-27/+52
| | | | Use the same code style as the rest of MPD.
* output_all: synchronize playback with player_control.notifyMax Kellermann2009-03-262-2/+4
| | | | | | | | | This patch fixes a longer delay when moving around songs in the playlist. The main thread wants to enqueue a new "next" song into the player thread, but the player thread is waiting inside audio_output_all_wait() for the output threads. Use player_control.notify there, so audio_output_all_wait() gets woken up by the main thread, too.
* playlist_state: fix playback restore in random modeMax Kellermann2009-03-261-2/+0
| | | | | | The functions playPlaylist() and seekSongInPlaylist() expect a song position, not a song order number. Don't convert the "current" variable with queue_position_to_order().
* queue/playlist/command: move rangeJeffrey Middleton2009-03-265-17/+72
| | | | | | | | | | | The move command now accepts a range for the first argument, in the same form as other range commands, e.g. move 15:17 3. The first song in the range is placed at the destination position. Note that as with other range commands, the range is inclusive on the left only; this example would move only songs 15 and 16, not 17. [mk: fixed signed/unsigned warnings; use G_MAXUINT instead of UINT_MAX]
* pulse_mixer: removed superfluous initializationsMax Kellermann2009-03-261-7/+2
| | | | | | Don't initialize attributes which are only used in an open mixer. As long as nobody accesses them, their values are uninitialized and undefined.
* pulse_mixer: allocate "volume" staticallyMax Kellermann2009-03-261-10/+6
| | | | | | | The pm->volume attribute was allocated in pulse_mixer_init(), but is never freed. This leaks memory. Instead of adding the g_free() call to pulse_mixer_finish(), let's just make "volume" a static attribute of the pulse_mixer struct. That is easier to deal with.
* pulse_mixer: removed superfluous NULL checks in close()Max Kellermann2009-03-261-12/+4
| | | | | When the MPD core knows that the pulse mixer is open, pm->mainloop and pm->context must be non-NULL.
* pulse_mixer: initialize "online" and "index" in open()Max Kellermann2009-03-261-2/+5
| | | | | The attributes "online" and "index" were not properly reinitialized after a close/open cycle.
* pulse: make configuration strings constMax Kellermann2009-03-262-12/+10
| | | | | | Nobody needs to modify these strings. We can make them const, and convert config_dup_block_string() to config_get_block_string(). This also fixes memory leaks in the pulse mixer.
* pulse: don't check config_param!=NULLMax Kellermann2009-03-262-10/+5
| | | | | The conf.h functions deal well with config_param==NULL and will return the specified default value then.
* pulse_mixer: free libpulse objects on failureMax Kellermann2009-03-261-0/+6
| | | | | When the mixer initialization fails, we have to free the libpulse objects we have already created, to prevent resource leaks.
* pulse_mixer: unlock the mainloop on failureMax Kellermann2009-03-261-0/+2
| | | | | It's illegal to return from pulse_mixer_setup() without unlocking the main loop. In the error handling, that unlock() call was missing.
* pulse_mixer: moved code to pulse_mixer_setup()Max Kellermann2009-03-261-15/+26
| | | | Prepare for adding proper error handling.
* alsa_mixer: initialize "volume_set" in the open() methodMax Kellermann2009-03-261-2/+2
| | | | | | "volume_set" is an attribute which becomes undefined when the mixer is closed. That means, it must be initialized each time the mixer is opened.
* alsa_mixer: removed superfluous checksMax Kellermann2009-03-261-10/+6
| | | | | | The MPD core guarantees that methods are always invoked in a consistent state. This means we can remove lots of checks from the volume methods.
* alsa_mixer: pass default device to config_get_block_string()Max Kellermann2009-03-261-14/+7
| | | | | Instead of replacing NULL with the default device in the open() method, pass the default device to config_get_block_string().
* alsa_mixer: make "device" and "control" constMax Kellermann2009-03-261-6/+5
| | | | Use config_get_block_string() instead of config_dup_block_string().
* oss_mixer: call oss_find_mixer() in init() methodMax Kellermann2009-03-261-25/+26
| | | | Detect misconfiguration during MPD startup.
* oss_mixer: removed superfluous checksMax Kellermann2009-03-261-8/+8
| | | | | | The MPD core guarantees that methods are always invoked in a consistent state. This means we can remove lots of checks from the volume methods.
* oss_mixer: use g_ascii_strncasecmp() instead of strncasecmp()Max Kellermann2009-03-261-1/+1
| | | | strncasecmp() is locale dependent, but we only need ASCII here.
* oss_mixer: pass default path to config_get_block_string()Max Kellermann2009-03-261-8/+5
| | | | | Instead of replacing NULL with the default path in the open() method, pass the default path to config_get_block_string().
* oss_mixer: make "device" and "control" constMax Kellermann2009-03-261-6/+5
| | | | Use config_get_block_string() instead of config_dup_block_string().
* mixer: don't reopen failed mixer automaticallyMax Kellermann2009-03-263-2/+13
| | | | | | If a (global) mixer has been closed due to failure, don't reopen it with every volume get/set. Leave it closed until it is explicitly opened.
* mixer_control: close mixer on failureMax Kellermann2009-03-263-5/+16
| | | | | When getting or setting the volume fails, the MPD core close the mixer. Moved the duplicated code from the mixer plugins.
* mixer: added flag "open"Max Kellermann2009-03-268-5/+61
| | | | | | | | | | | | Remember if a mixer object is open or closed. Don't call open() again if it is already open. This guarantees that the mixer plugin is always called in a consistent state, and we will be able to remove lots of checks from the implementations. To support mixers which are automatically opened even if the audio output is still closed (to set the volume before playback starts), this patch also adds the "global" flag to the mixer_plugin struct. Both ALSA and OSS set this flag, while PULSE does not.
* mixer_control: don't allow mixer==NULLMax Kellermann2009-03-261-9/+7
| | | | | | As a side effect, the previous patch added the mixer==NULL checks. It is now illegal to call mixer functions with a NULL argument. Convert the runtime checks to assertions.
* output_plugin: replaced output_plugin.get_mixer() with mixer_pluginMax Kellermann2009-03-269-77/+44
| | | | | | The mixer core library is now responsible for creating and managing the mixer object. This removes duplicated code from the output plugins.
* player_thread: wait for decoder before seekingMax Kellermann2009-03-252-0/+12
| | | | | | | When the decoder initialization has not been completed yet, all calls to dc_seek() will fail, because dc.seekable is not initialized yet. Wait for the decoder to complete its initialization, i.e. until it has called decoder_initialized().
* playlist_state: start playing after restore is completeMax Kellermann2009-03-251-18/+17
| | | | | | | | | | | Don't start playback as soon as the "current" song is being loaded from the state file. That is unclean, and leads to an obscure bug: in repeat mode, when the song is started (which is yet the last song in the list), the playlist code marked the very first song in the playlist as "next" song, because the end of the playlist was wrapped. It's easier to set up the playback after all songs have been loaded, and after the random/repeat mode has been set.
* output_all: synchronize playback with a notify objectMax Kellermann2009-03-252-2/+3
| | | | | | Use audio_output_client_notify instead of g_usleep(1ms) in audio_output_all_wait() to synchronize with the output_thread. Signal the audio_output_client_notify object in ao_play().
* output_all: moved code to audio_output_all_wait()Max Kellermann2009-03-253-10/+25
| | | | | | Synchronization with the output thread will be implemented in output_all.c, not in player_thread.c. Currently, that's just a simple g_usleep(1ms).
* output: protect audio_output.open with the mutexMax Kellermann2009-03-253-15/+33
| | | | | | There was a deadlock between the output thread and the player thread: when the output thread failed (and closed itself) while the player thread worked with the audio_output object, MPD could crash.
* move printAllOutputPluginTypes to output_list.cViliam Mateicka2009-03-215-63/+18
|
* output_control: close earlier on format mismatchMax Kellermann2009-03-201-3/+3
| | | | | To prevent a race condition, close the output thread before assigning the new audio format.
* output: convert audio_output.config_audio_format to booleanMax Kellermann2009-03-203-20/+17
| | | | | | | The config_audio_format used to contain the configured audio format, which is copied to out_audio_format. Let's convert the former to a boolean, which indicates whether out_audio_format was already set. This simplifies some code and saves a few bytes.
* page: added page_new_concat()Max Kellermann2009-03-172-0/+20
|
* player_thread: ignore time stamp on empty chunksMax Kellermann2009-03-171-3/+6
| | | | | If a music_chunk does not contain any PCM data, then the "times" and "bit_rate" attributes are undefined.
* flac/cue: added support for TITLE[n] commentsMario Lenz2009-03-171-2/+9
| | | | | | | | | | | | On 2009/03/17 Max Kellermann<max@duempel.org> wrote: > There doesn't seem to be an "official" standard. I'd say: search for > TITLE[1] first (the most explicit form), then TITLE1, and finally fall > back to TITLE. This makes sure MPD supports every possible standard, > without breaking. I've also added some additional checks to make sure entry is long enough.
* pulse_mixer: keep mixer attached when another pulse sink is closed.David Guibert2009-03-171-1/+2
| | | | | | The mixer state is defined as offline only if the associated stream is removed. Signed-off-by: David Guibert <david.guibert@gmail.com>
* pulse_mixer: closeDavid Guibert2009-03-171-1/+14
| | | | | | | | | when the mixer is closed, - the mainloop is stopped. - the context is disconnected. - then the mainloop is freed. Signed-off-by: David Guibert <david.guibert@gmail.com>
* httpd: fixed encoder plugin checkJeffrey Middleton2009-03-171-1/+1
| | | | | Check if encoder_plugin!=NULL, not encoder_plugin_get (which is a function).
* flac: get CUE track titles from additional FLAC commentsMario Lenz2009-03-164-23/+32
| | | | | | | | The cue sheet embedded in a flac file doen't contain any information about track titles and similar. There are three possibilities: Use an external cue sheet that includes these information, use a tag CUESHEET with a cue sheet including these information or use tags. I think the latter is the best option and is already used by other projects.
* socket_util: use g_strerror() instead of strerror()Max Kellermann2009-03-161-1/+1
| | | | | g_strerror() is more portable, and guarantees that the returned string is UTF-8 encoded.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 16:48:24 +0000