525a791987
When playing a CUE track, the player thread waited for the decoder to become ready, and then sent a SEEK command to the beginning of the CUE track. If that is near the start of the song file, and the track is short enough, the decoder could have finished decoding already at that point, and seeking fails. This commit makes this initial seek more robust: instead of letting the player thread deal with the difficult timings, let the decoder API emulate a SEEK command, and return it to the decoder plugin, as soon as the plugin finishes its initialization.
101 lines
2.6 KiB
C
101 lines
2.6 KiB
C
/*
|
|
* Copyright (C) 2003-2010 The Music Player Daemon Project
|
|
* http://www.musicpd.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPD_DECODER_INTERNAL_H
|
|
#define MPD_DECODER_INTERNAL_H
|
|
|
|
#include "decoder_command.h"
|
|
#include "pcm_convert.h"
|
|
#include "replay_gain_info.h"
|
|
|
|
struct input_stream;
|
|
|
|
struct decoder {
|
|
struct decoder_control *dc;
|
|
|
|
struct pcm_convert_state conv_state;
|
|
|
|
/**
|
|
* The time stamp of the next data chunk, in seconds.
|
|
*/
|
|
double timestamp;
|
|
|
|
/**
|
|
* Is the initial seek (to the start position of the sub-song)
|
|
* pending, or has it been performed already?
|
|
*/
|
|
bool initial_seek_pending;
|
|
|
|
/**
|
|
* Is the initial seek currently running? During this time,
|
|
* the decoder command is SEEK. This flag is set by
|
|
* decoder_get_virtual_command(), when the virtual SEEK
|
|
* command is generated for the first time.
|
|
*/
|
|
bool initial_seek_running;
|
|
|
|
/**
|
|
* This flag is set by decoder_seek_where(), and checked by
|
|
* decoder_command_finished(). It is used to clean up after
|
|
* seeking.
|
|
*/
|
|
bool seeking;
|
|
|
|
/**
|
|
* The tag from the song object. This is only used for local
|
|
* files, because we expect the stream server to send us a new
|
|
* tag each time we play it.
|
|
*/
|
|
struct tag *song_tag;
|
|
|
|
/** the last tag received from the stream */
|
|
struct tag *stream_tag;
|
|
|
|
/** the last tag received from the decoder plugin */
|
|
struct tag *decoder_tag;
|
|
|
|
/** the chunk currently being written to */
|
|
struct music_chunk *chunk;
|
|
|
|
struct replay_gain_info replay_gain_info;
|
|
|
|
/**
|
|
* A positive serial number for checking if replay gain info
|
|
* has changed since the last check.
|
|
*/
|
|
unsigned replay_gain_serial;
|
|
};
|
|
|
|
/**
|
|
* Returns the current chunk the decoder writes to, or allocates a new
|
|
* chunk if there is none.
|
|
*
|
|
* @return the chunk, or NULL if we have received a decoder command
|
|
*/
|
|
struct music_chunk *
|
|
decoder_get_chunk(struct decoder *decoder, struct input_stream *is);
|
|
|
|
/**
|
|
* Flushes the current chunk.
|
|
*/
|
|
void
|
|
decoder_flush_chunk(struct decoder *decoder);
|
|
|
|
#endif
|