a464dc681a
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUEdhhAAoJECNuiljG20USwKkP/1MIm6J2ydXEP81RD/3llz6h 2t8EK94cEIdb6bA6goBI0Pipz7YAtmjgfnDRW90AvFcxNuVt87esxG82gVOiosvo 7LByehQ2kq/w0evILWy8X1eAvqIk/PvG6T/pZcPrrj7kHrZaIOXh0SVTZ5NLq7HC drunwHQxgVntB/410h7BKEFbg1qWHPGxfTyf6qJsZPkHfr5QcgbHrYN7QCr1eUv9 mARx4Nxo9MXuiqOJOS7ck80V68nbnFdxjNXSflUkl94O0MfiPc741Snbe7qnHI91 I+BQYCBExKzoqFszuuRZQjxFpJalg4Y/9/stn6+dYemtC3WpreGHogweUBlPZ5if wJRL/A/zHAY0xE/hohiEqY6pHZWmVolbumtp7LfNR7dejOetn0IPW+KnFnjYec21 qkJG/mq8fHStdQMTzp5NDoqh8VrPaBAAhjgP3suZY2wZ5xfbLXHk/HNKdQLvX8s3 Vv4wcDNsfbOJ/1ZTBo/nqceTkOyHrov5cDSotYnO1hs963vyk3LFwY2IRCgPdOR0 7o77JmKHZnzZSw60CIT6Mf1+rx38x++Rq3UGDYuH4B4L4VqXv2WrUp32w1VzHQVO Dcd/dxwW/sB1SwMdi5J4tIBJCSn5mF7yvBPR0PB5NiZiX1YB6hEqmaXYfwLCqujo xyWy8gPJbmYw6XJPmw6A =3azu -----END PGP SIGNATURE----- Merge tag 'v0.18.14'
105 lines
2.2 KiB
C++
105 lines
2.2 KiB
C++
/*
|
|
* Copyright (C) 2003-2014 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.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include "DecoderInternal.hxx"
|
|
#include "DecoderControl.hxx"
|
|
#include "pcm/PcmConvert.hxx"
|
|
#include "MusicPipe.hxx"
|
|
#include "MusicBuffer.hxx"
|
|
#include "MusicChunk.hxx"
|
|
#include "tag/Tag.hxx"
|
|
|
|
#include <assert.h>
|
|
|
|
Decoder::~Decoder()
|
|
{
|
|
/* caller must flush the chunk */
|
|
assert(chunk == nullptr);
|
|
|
|
if (convert != nullptr) {
|
|
convert->Close();
|
|
delete convert;
|
|
}
|
|
|
|
delete song_tag;
|
|
delete stream_tag;
|
|
delete decoder_tag;
|
|
}
|
|
|
|
/**
|
|
* All chunks are full of decoded data; wait for the player to free
|
|
* one.
|
|
*/
|
|
static DecoderCommand
|
|
need_chunks(DecoderControl &dc)
|
|
{
|
|
if (dc.command == DecoderCommand::NONE)
|
|
dc.Wait();
|
|
|
|
return dc.command;
|
|
}
|
|
|
|
MusicChunk *
|
|
Decoder::GetChunk()
|
|
{
|
|
DecoderCommand cmd;
|
|
|
|
if (chunk != nullptr)
|
|
return chunk;
|
|
|
|
do {
|
|
chunk = dc.buffer->Allocate();
|
|
if (chunk != nullptr) {
|
|
chunk->replay_gain_serial = replay_gain_serial;
|
|
if (replay_gain_serial != 0)
|
|
chunk->replay_gain_info = replay_gain_info;
|
|
|
|
return chunk;
|
|
}
|
|
|
|
dc.Lock();
|
|
cmd = need_chunks(dc);
|
|
dc.Unlock();
|
|
} while (cmd == DecoderCommand::NONE);
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
void
|
|
Decoder::FlushChunk()
|
|
{
|
|
assert(!seeking);
|
|
assert(!initial_seek_running);
|
|
assert(!initial_seek_pending);
|
|
assert(chunk != nullptr);
|
|
|
|
if (chunk->IsEmpty())
|
|
dc.buffer->Return(chunk);
|
|
else
|
|
dc.pipe->Push(chunk);
|
|
|
|
chunk = nullptr;
|
|
|
|
dc.Lock();
|
|
if (dc.client_is_waiting)
|
|
dc.client_cond.signal();
|
|
dc.Unlock();
|
|
}
|