aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/Input/aac/decoder_aac.cpp3
-rw-r--r--src/plugins/Input/cdaudio/decoder_cdaudio.cpp1
-rw-r--r--src/plugins/Input/cue/decoder_cue.cpp1
-rw-r--r--src/plugins/Input/flac/decoder_flac.cpp1
-rw-r--r--src/plugins/Input/modplug/decoder_modplug.cpp7
-rw-r--r--src/plugins/Input/mpc/decoder_mpc.cpp3
-rw-r--r--src/plugins/Input/sndfile/decoder_sndfile.cpp5
-rw-r--r--src/plugins/Input/vorbis/decoder_vorbis.cpp3
-rw-r--r--src/plugins/Input/wavpack/decoder_wavpack.cpp1
-rw-r--r--src/qmmp/output.h1
-rw-r--r--src/qmmp/outputwriter_p.h3
-rw-r--r--src/qmmp/qmmp.pro9
-rw-r--r--src/qmmp/recycler.cpp2
-rw-r--r--src/qmmp/recycler_p.h (renamed from src/qmmp/recycler.h)7
14 files changed, 16 insertions, 31 deletions
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 <QObject>
#include <QIODevice>
#include <QtGlobal>
-
#include <qmmp/buffer.h>
#include <qmmp/output.h>
-#include <qmmp/recycler.h>
-
#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 <cddb/cddb.h>
#include <qmmp/buffer.h>
#include <qmmp/output.h>
-#include <qmmp/recycler.h>
#include <qmmp/qmmpsettings.h>
#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 <QFile>
#include <qmmp/buffer.h>
#include <qmmp/output.h>
-#include <qmmp/recycler.h>
#include <qmmp/fileinfo.h>
#include <qmmp/decoderfactory.h>
#include <qmmp/soundcore.h>
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 <taglib/id3v2header.h>
#include <qmmp/buffer.h>
#include <qmmp/output.h>
-#include <qmmp/recycler.h>
#include <qmmp/statehandler.h>
#include <QObject>
#include <QFile>
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 <QDir>
#include <QSettings>
#include <math.h>
-
#include <libmodplug/stdafx.h>
#include <libmodplug/it_defs.h>
#include <libmodplug/sndfile.h>
-
#include <qmmp/buffer.h>
#include <qmmp/output.h>
-#include <qmmp/recycler.h>
-
#include <stdint.h>
-
#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 <QIODevice>
#include <qmmp/buffer.h>
#include <qmmp/output.h>
-#include <qmmp/recycler.h>
#include <math.h>
#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 <QObject>
#include <QFile>
#include <QFileInfo>
-
#include <qmmp/buffer.h>
#include <qmmp/output.h>
-#include <qmmp/recycler.h>
-
#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 <qmmp/buffer.h>
#include <qmmp/output.h>
-#include <qmmp/recycler.h>
#include <qmmp/fileinfo.h>
#include <QObject>
#include <QIODevice>
#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 <stdint.h>
#include <qmmp/buffer.h>
#include <qmmp/output.h>
-#include <qmmp/recycler.h>
#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 <QThread>
#include <QMutex>
-#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 <forkotov02@hotmail.ru>
*/
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_p.h
index 222b3886f..8ca458643 100644
--- a/src/qmmp/recycler.h
+++ b/src/qmmp/recycler_p.h
@@ -4,15 +4,16 @@
// warranty, or liability of any kind.
//
-#ifndef __recycler_h
-#define __recycler_h
+#ifndef RECYCLER_P_H
+#define RECYCLER_P_H
#include <QMutex>
#include <QWaitCondition>
#include "qmmp.h"
#include "buffer.h"
-/*! @brief The Recycler class provides a queue of audio buffers.
+/*! @internal
+ * @brief The Recycler class provides a queue of audio buffers.
* @author Brad Hughes <bhughes@trolltech.com>
*/
class Recycler
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 18:09:17 +0000