From 5ed184f6e376ad876f5026f9a4e450ae7e8ac965 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 7 Dec 2012 19:08:40 +0000 Subject: marking recycler as private api git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3037 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/aac/decoder_aac.cpp | 3 - src/plugins/Input/cdaudio/decoder_cdaudio.cpp | 1 - src/plugins/Input/cue/decoder_cue.cpp | 1 - src/plugins/Input/flac/decoder_flac.cpp | 1 - src/plugins/Input/modplug/decoder_modplug.cpp | 7 +- src/plugins/Input/mpc/decoder_mpc.cpp | 3 +- src/plugins/Input/sndfile/decoder_sndfile.cpp | 5 +- src/plugins/Input/vorbis/decoder_vorbis.cpp | 3 +- src/plugins/Input/wavpack/decoder_wavpack.cpp | 1 - src/qmmp/output.h | 1 - src/qmmp/outputwriter_p.h | 3 +- src/qmmp/qmmp.pro | 9 ++- src/qmmp/recycler.cpp | 2 +- src/qmmp/recycler.h | 104 ------------------------- src/qmmp/recycler_p.h | 105 ++++++++++++++++++++++++++ 15 files changed, 117 insertions(+), 132 deletions(-) delete mode 100644 src/qmmp/recycler.h create mode 100644 src/qmmp/recycler_p.h (limited to 'src') diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp index ca740bced..6d60280e8 100644 --- a/src/plugins/Input/aac/decoder_aac.cpp +++ b/src/plugins/Input/aac/decoder_aac.cpp @@ -22,11 +22,8 @@ #include #include #include - #include #include -#include - #include "decoder_aac.h" #include "aacfile.h" diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp index 436133330..76abc2a2b 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #define CDDA_SECTORS 4 diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index a8383ac94..4c88f06b2 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index aa895de0a..19646316f 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp index 136196cb9..17de36429 100644 --- a/src/plugins/Input/modplug/decoder_modplug.cpp +++ b/src/plugins/Input/modplug/decoder_modplug.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2009 by Ilya Kotov * + * Copyright (C) 2008-2012 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -28,17 +28,12 @@ #include #include #include - #include #include #include - #include #include -#include - #include - #include "archivereader.h" #include "decoder_modplug.h" diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp index f3a389d28..3861bffa6 100644 --- a/src/plugins/Input/mpc/decoder_mpc.cpp +++ b/src/plugins/Input/mpc/decoder_mpc.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2009 by Ilya Kotov * + * Copyright (C) 2006-2012 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "decoder_mpc.h" diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp index 38ede436e..46bfcdedd 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.cpp +++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2009 by Ilya Kotov * + * Copyright (C) 2007-2012 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -21,11 +21,8 @@ #include #include #include - #include #include -#include - #include "decoder_sndfile.h" // Decoder class diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp index d1bddb0c9..a32a18d52 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.cpp +++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp @@ -7,13 +7,12 @@ #include #include -#include #include #include #include #include "decoder_vorbis.h" -// ic functions for OggVorbis +// ic functions for OggVorbis static size_t oggread (void *buf, size_t size, size_t nmemb, void *src) { if (! src) return 0; diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index 8dd8e0cdc..21ccf665b 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include "decoder_wavpack.h" #include "cueparser.h" diff --git a/src/qmmp/output.h b/src/qmmp/output.h index 59799a57b..53b3d2984 100644 --- a/src/qmmp/output.h +++ b/src/qmmp/output.h @@ -19,7 +19,6 @@ #include "visualfactory.h" #include "statehandler.h" #include "audioparameters.h" -#include "recycler.h" class QTimer; class QmmpSettings; diff --git a/src/qmmp/outputwriter_p.h b/src/qmmp/outputwriter_p.h index 96c94638e..b2587fc21 100644 --- a/src/qmmp/outputwriter_p.h +++ b/src/qmmp/outputwriter_p.h @@ -23,7 +23,7 @@ #include #include -#include "recycler.h" +#include "recycler_p.h" #include "audioparameters.h" class QTimer; @@ -32,6 +32,7 @@ class StateHandler; class Output; /** @internal + @brief Output thread. @author Ilya Kotov */ class OutputWriter : public QThread diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro index c31cb2761..02541d060 100644 --- a/src/qmmp/qmmp.pro +++ b/src/qmmp/qmmp.pro @@ -35,8 +35,8 @@ HEADERS += \ qmmpevents_p.h \ volume.h \ volumecontrol_p.h \ - recycler.h \ - outputwriter_p.h + outputwriter_p.h \ + recycler_p.h SOURCES += recycler.cpp \ decoder.cpp \ output.cpp \ @@ -109,8 +109,7 @@ unix { metadatamanager.h \ qmmpsettings.h \ eqsettings.h \ - volume.h \ - recycler.h + volume.h devel.path = /include/qmmp INSTALLS += target \ devel @@ -126,3 +125,5 @@ INCLUDEPATH += ./ + + diff --git a/src/qmmp/recycler.cpp b/src/qmmp/recycler.cpp index 6c91be5e7..533c453a3 100644 --- a/src/qmmp/recycler.cpp +++ b/src/qmmp/recycler.cpp @@ -4,7 +4,7 @@ // warranty, or liability of any kind. // -#include "recycler.h" +#include "recycler_p.h" #include "qmmpsettings.h" #include "audioparameters.h" #include "buffer.h" diff --git a/src/qmmp/recycler.h b/src/qmmp/recycler.h deleted file mode 100644 index 222b3886f..000000000 --- a/src/qmmp/recycler.h +++ /dev/null @@ -1,104 +0,0 @@ -// Copyright (c) 2000-2001 Brad Hughes -// -// Use, modification and distribution is allowed without limitation, -// warranty, or liability of any kind. -// - -#ifndef __recycler_h -#define __recycler_h - -#include -#include -#include "qmmp.h" -#include "buffer.h" - -/*! @brief The Recycler class provides a queue of audio buffers. - * @author Brad Hughes - */ -class Recycler -{ -public: - /*! - * Constructor. - */ - Recycler(); - /*! - * Destructor. - */ - ~Recycler(); - /*! - * Setups audio parameters of output interface. - * @param freq Sample rate. - * @param chan Number of channels. - * @param format Audio format - */ - void configure(quint32 freq, int chan, Qmmp::AudioFormat format); - /*! - * Returns \b true if queue if full, otherwise returns \b false - */ - bool full() const; - /*! - * Returns \b true if queue if empty, otherwise returns \b false - */ - bool empty() const; - /*! - * Returns a number of available buffers. - */ - int available() const; - /*! - * Returns a number of used buffers. - */ - int used() const; - /*! - * Returns next buffer in queue. - */ - Buffer *next(); - /*! - * Returns current buffer for writing. - */ - Buffer *get(); // get next in recycle - /*! - * Adds current buffer to queue. - */ - void add(); // add to queue - /*! - * Removes current buffer from queue. - */ - void done(); // add to recycle - /*! - * Clears queue. - */ - void clear(); // clear queue - /*! - * Returns size of all buffers in bytes. - */ - unsigned long size() const; // size in bytes - /*! - * Returns mutex pointer. - */ - QMutex *mutex() - { - return &m_mtx; - } - /*! - * Returns wait condition pointer. - */ - QWaitCondition *cond() - { - return &m_cnd; - } - /*! - * Returns \b true if the next buffer is used by output. Otherwise returns \b false. - */ - bool blocked(); - -private: - unsigned int m_buffer_count, m_add_index, m_done_index, m_current_count; - unsigned long m_block_size; - Buffer **m_buffers; - QMutex m_mtx; - QWaitCondition m_cnd; - Buffer *m_blocked; -}; - -#endif // __recycler_h diff --git a/src/qmmp/recycler_p.h b/src/qmmp/recycler_p.h new file mode 100644 index 000000000..8ca458643 --- /dev/null +++ b/src/qmmp/recycler_p.h @@ -0,0 +1,105 @@ +// Copyright (c) 2000-2001 Brad Hughes +// +// Use, modification and distribution is allowed without limitation, +// warranty, or liability of any kind. +// + +#ifndef RECYCLER_P_H +#define RECYCLER_P_H + +#include +#include +#include "qmmp.h" +#include "buffer.h" + +/*! @internal + * @brief The Recycler class provides a queue of audio buffers. + * @author Brad Hughes + */ +class Recycler +{ +public: + /*! + * Constructor. + */ + Recycler(); + /*! + * Destructor. + */ + ~Recycler(); + /*! + * Setups audio parameters of output interface. + * @param freq Sample rate. + * @param chan Number of channels. + * @param format Audio format + */ + void configure(quint32 freq, int chan, Qmmp::AudioFormat format); + /*! + * Returns \b true if queue if full, otherwise returns \b false + */ + bool full() const; + /*! + * Returns \b true if queue if empty, otherwise returns \b false + */ + bool empty() const; + /*! + * Returns a number of available buffers. + */ + int available() const; + /*! + * Returns a number of used buffers. + */ + int used() const; + /*! + * Returns next buffer in queue. + */ + Buffer *next(); + /*! + * Returns current buffer for writing. + */ + Buffer *get(); // get next in recycle + /*! + * Adds current buffer to queue. + */ + void add(); // add to queue + /*! + * Removes current buffer from queue. + */ + void done(); // add to recycle + /*! + * Clears queue. + */ + void clear(); // clear queue + /*! + * Returns size of all buffers in bytes. + */ + unsigned long size() const; // size in bytes + /*! + * Returns mutex pointer. + */ + QMutex *mutex() + { + return &m_mtx; + } + /*! + * Returns wait condition pointer. + */ + QWaitCondition *cond() + { + return &m_cnd; + } + /*! + * Returns \b true if the next buffer is used by output. Otherwise returns \b false. + */ + bool blocked(); + +private: + unsigned int m_buffer_count, m_add_index, m_done_index, m_current_count; + unsigned long m_block_size; + Buffer **m_buffers; + QMutex m_mtx; + QWaitCondition m_cnd; + Buffer *m_blocked; +}; + +#endif // __recycler_h -- cgit v1.2.3-13-gbd6f