oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/xiph/OggStream: remove obsolete class

Browse Source
This commit is contained in:
Max Kellermann 2016-05-09 14:55:58 +02:00
parent 068de7cf40
commit 461f298d2c
2 changed files with 1 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -597,8 +597,7 @@ libxiph_a_SOURCES += \
src/lib/xiph/OggUtil.cxx src/lib/xiph/OggUtil.hxx \ src/lib/xiph/OggUtil.cxx src/lib/xiph/OggUtil.hxx \
src/lib/xiph/OggSyncState.hxx \ src/lib/xiph/OggSyncState.hxx \
src/lib/xiph/OggPage.hxx \ src/lib/xiph/OggPage.hxx \
src/lib/xiph/OggStreamState.hxx \ src/lib/xiph/OggStreamState.hxx
src/lib/xiph/OggStream.hxx
endif endif
XIPH_LIBS = libxiph.a XIPH_LIBS = libxiph.a

112
src/lib/xiph/OggStream.hxx
View File

@ -1,112 +0,0 @@
/*
* Copyright 2003-2016 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_OGG_STREAM_HXX
#define MPD_OGG_STREAM_HXX
#include "check.h"
#include "OggPage.hxx"
#include <ogg/ogg.h>
#include <assert.h>
class OggStream {
ogg_stream_state state;
bool flush;
#ifndef NDEBUG
bool initialized = false;
#endif
public:
#ifndef NDEBUG
~OggStream() {
assert(!initialized);
}
#endif
void Initialize(int serialno) {
assert(!initialized);
ogg_stream_init(&state, serialno);
/* set "flush" to true, so the caller gets the full
headers on the first read() */
flush = true;
#ifndef NDEBUG
initialized = true;
#endif
}
void Reinitialize(int serialno) {
assert(initialized);
ogg_stream_reset_serialno(&state, serialno);
/* set "flush" to true, so the caller gets the full
headers on the first read() */
flush = true;
}
void Deinitialize() {
assert(initialized);
ogg_stream_clear(&state);
#ifndef NDEBUG
initialized = false;
#endif
}
void Flush() {
assert(initialized);
flush = true;
}
void PacketIn(const ogg_packet &packet) {
assert(initialized);
ogg_stream_packetin(&state,
const_cast<ogg_packet *>(&packet));
}
bool PageOut(ogg_page &page) {
int result = ogg_stream_pageout(&state, &page);
if (result == 0 && flush) {
flush = false;
result = ogg_stream_flush(&state, &page);
}
return result != 0;
}
size_t PageOut(void *buffer, size_t size) {
ogg_page page;
if (!PageOut(page))
return 0;
return ReadPage(page, buffer, size);
}
};
#endif