aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-10-03 15:31:49 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-10-03 15:31:49 +0000
commitaab2fd616b244e143d286ad83d751c6eec5d9b5e (patch)
treea27663d65cafd792f1eea0484f17dbb8e570e60c /src
parent248e6e3681d09d527c44d65b4c5d141fabc773a4 (diff)
downloadqmmp-aab2fd616b244e143d286ad83d751c6eec5d9b5e.tar.gz
qmmp-aab2fd616b244e143d286ad83d751c6eec5d9b5e.tar.bz2
qmmp-aab2fd616b244e143d286ad83d751c6eec5d9b5e.zip
converter: added preset structure
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2373 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
-rw-r--r--src/plugins/General/converter/converter.h3
-rw-r--r--src/plugins/General/converter/converter.pro4
-rw-r--r--src/plugins/General/converter/converterdialog.cpp5
-rw-r--r--src/plugins/General/converter/converterdialog.h1
-rw-r--r--src/plugins/General/converter/converterfactory.h7
-rw-r--r--src/plugins/General/converter/converterhelper.h1
-rw-r--r--src/plugins/General/converter/preset.h38
-rw-r--r--src/plugins/General/converter/preseteditor.h3
8 files changed, 57 insertions, 5 deletions
diff --git a/src/plugins/General/converter/converter.h b/src/plugins/General/converter/converter.h
index 2a65f3983..080d3688d 100644
--- a/src/plugins/General/converter/converter.h
+++ b/src/plugins/General/converter/converter.h
@@ -28,6 +28,9 @@
#include <qmmp/decoder.h>
#include <qmmp/inputsource.h>
+/**
+ @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
class Converter : public QThread
{
Q_OBJECT
diff --git a/src/plugins/General/converter/converter.pro b/src/plugins/General/converter/converter.pro
index d3a395b3a..a57af2e27 100644
--- a/src/plugins/General/converter/converter.pro
+++ b/src/plugins/General/converter/converter.pro
@@ -41,7 +41,8 @@ HEADERS += converterfactory.h \
converterhelper.h \
converterdialog.h \
converter.h \
- preseteditor.h
+ preseteditor.h \
+ preset.h
win32:HEADERS += ../../../../src/qmmpui/general.h
SOURCES += converterfactory.cpp \
converterhelper.cpp \
@@ -54,3 +55,4 @@ FORMS += converterdialog.ui \
+
diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index 193b0bdd3..df3db7aa5 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -135,3 +135,8 @@ void ConverterDialog::deletePreset()
{
}
+
+void ConverterDialog::readSettings()
+{
+
+}
diff --git a/src/plugins/General/converter/converterdialog.h b/src/plugins/General/converter/converterdialog.h
index 5671c07bf..28d0a6844 100644
--- a/src/plugins/General/converter/converterdialog.h
+++ b/src/plugins/General/converter/converterdialog.h
@@ -51,6 +51,7 @@ private slots:
private:
void createMenus();
+ void readSettings();
Ui::ConverterDialog ui;
diff --git a/src/plugins/General/converter/converterfactory.h b/src/plugins/General/converter/converterfactory.h
index 33949664f..83d90ab76 100644
--- a/src/plugins/General/converter/converterfactory.h
+++ b/src/plugins/General/converter/converterfactory.h
@@ -20,15 +20,16 @@
#ifndef CONVERTERFACTORY_H
#define CONVERTERFACTORY_H
-/**
- @author Ilya Kotov <forkotov02@hotmail.ru>
-*/
+
#include <QObject>
#include <QTranslator>
#include <QDialog>
#include <qmmpui/general.h>
#include <qmmpui/generalfactory.h>
+/**
+ @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
class ConverterFactory : public QObject, public GeneralFactory
{
Q_OBJECT
diff --git a/src/plugins/General/converter/converterhelper.h b/src/plugins/General/converter/converterhelper.h
index 312326680..71fe0cc66 100644
--- a/src/plugins/General/converter/converterhelper.h
+++ b/src/plugins/General/converter/converterhelper.h
@@ -32,7 +32,6 @@ class Converter;
/**
@author Ilya Kotov <forkotov02@hotmail.ru>
*/
-
class ConverterHelper : public QObject
{
Q_OBJECT
diff --git a/src/plugins/General/converter/preset.h b/src/plugins/General/converter/preset.h
new file mode 100644
index 000000000..8958bbd65
--- /dev/null
+++ b/src/plugins/General/converter/preset.h
@@ -0,0 +1,38 @@
+/***************************************************************************
+ * Copyright (C) 2011 by Ilya Kotov *
+ * forkotov02@hotmail.ru *
+ * *
+ * 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., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+#ifndef PRESET_H
+#define PRESET_H
+
+#include <QString>
+
+/**
+ @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+struct ConverterPreset
+{
+ QString name;
+ QString extension;
+ QString command;
+ bool use16bit;
+ bool tags;
+};
+
+#endif // PRESET_H
diff --git a/src/plugins/General/converter/preseteditor.h b/src/plugins/General/converter/preseteditor.h
index e45226d72..8378009af 100644
--- a/src/plugins/General/converter/preseteditor.h
+++ b/src/plugins/General/converter/preseteditor.h
@@ -27,6 +27,9 @@ namespace Ui {
class PresetEditor;
}
+/**
+ @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
class PresetEditor : public QDialog
{
Q_OBJECT