Packman Build Service PMBS

flacon.changes Changed

flacon.spec Changed

flacon-2.1.1.tar.gz/outformats Deleted

flacon-2.1.1.tar.gz/outformats/flac.cpp Deleted

@@ -1,175 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * Flacon - audio File Encoder
- * https://github.com/flacon/flacon
- *
- * Copyright: 2012-2013
- * Alexander Sokoloff <sokoloff.a@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-
-#include "flac.h"
-#include "settings.h"
-#include "project.h"
-#include "inputaudiofile.h"
-
-#include <QDebug>
-
-OutFormat_Flac::OutFormat_Flac()
-{
- mId = "FLAC";
- mExt = "flac";
- mName = "Flac";
-}
-
-
-
-/************************************************
-
- ************************************************/
-bool OutFormat_Flac::check(QStringList *errors) const
-{
- bool res = OutFormat::check(errors);
-
- if (gainType() != OutFormat::GainDisable)
- {
- for (int i=0; i<project->count(); ++i)
- {
- if (project->disk(i)->audioFile()->sampleRate() > 48000)
- {
- *errors << QObject::tr("you can't use 'ReplayGain' for files with sample rates above 48kHz. Metaflac doesn't support such files.",
- "This string should begin with a lowercase letter. This is a part of the complex sentence.");
- res = false;
- break;
- }
- }
- }
-
- return res;
-}
-
-
-/************************************************
-
- ************************************************/
-QStringList OutFormat_Flac::encoderArgs(Track *track, const QString &outFile) const
-{
- QStringList args;
-
- args << settings->programName(encoderProgramName());
- args << "--force"; // Force overwriting of output files.
- args << "--silent"; // Suppress progress indicator
-
- // Settings .................................................
- args << QString("--compression-level-%1").arg(settings->value("Flac/Compression").toString());
-
-
- // Tags .....................................................
- if (!track->artist().isEmpty()) args << "--tag" << QString("artist=%1").arg(track->artist());
- if (!track->album().isEmpty()) args << "--tag" << QString("album=%1").arg(track->album());
- if (!track->genre().isEmpty()) args << "--tag" << QString("genre=%1").arg(track->genre());
- if (!track->date().isEmpty()) args << "--tag" << QString("date=%1").arg(track->date());
- if (!track->title().isEmpty()) args << "--tag" << QString("title=%1").arg(track->title());
- if (!track->comment().isEmpty()) args << "--tag" << QString("comment=%1").arg(track->comment());
- if (!track->disk()->discId().isEmpty()) args << "--tag" << QString("discId=%1").arg(track->disk()->discId());
- args << "--tag" << QString("TRACKNUMBER=%1").arg(track->trackNum());
- args << "--tag" << QString("TOTALTRACKS=%1").arg(track->disk()->count());
- args << "--tag" << QString("TRACKTOTAL=%1").arg(track->disk()->count());
-
-
- args << "-";
- args << "-o" << outFile;
- return args;
-}
-
-
-/************************************************
-
- ************************************************/
-QStringList OutFormat_Flac::gainArgs(const QStringList &files) const
-{
- QStringList args;
- args << settings->programName(gainProgramName());
- args << "--add-replay-gain";
- args << files;
-
- return args;
-}
-
-
-/************************************************
-
- ************************************************/
-QHash<QString, QVariant> OutFormat_Flac::defaultParameters() const
-{
- QHash<QString, QVariant> res;
- res.insert("Flac/Compression", 5);
- res.insert("Flac/ReplayGain", gainTypeToString(GainDisable));
- return res;
-}
-
-
-/************************************************
-
- ************************************************/
-EncoderConfigPage *OutFormat_Flac::configPage(QWidget *parent) const
-{
- return new ConfigPage_Flac(parent);
-}
-
-
-/************************************************
-
- ************************************************/
-ConfigPage_Flac::ConfigPage_Flac(QWidget *parent):
- EncoderConfigPage(parent)
-{
- setupUi(this);
-
- setLosslessToolTip(flacCompressionSlider);
- flacCompressionSpin->setToolTip(flacCompressionSlider->toolTip());
- fillReplayGainComboBox(flacGainCbx);
-}
-
-
-/************************************************
-
- ************************************************/
-void ConfigPage_Flac::load()
-{
- loadWidget("Flac/Compression", flacCompressionSlider);
- loadWidget("Flac/ReplayGain", flacGainCbx);
-}
-
-
-/************************************************
-
- ************************************************/
-void ConfigPage_Flac::write()
-{
- writeWidget("Flac/Compression", flacCompressionSlider);
- writeWidget("Flac/ReplayGain", flacGainCbx);
-}
-
-
-
-
-
-
-

flacon-2.1.1.tar.gz/outformats/flac.h Deleted

@@ -1,62 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * Flacon - audio File Encoder
- * https://github.com/flacon/flacon
- *
- * Copyright: 2012-2013
- * Alexander Sokoloff <sokoloff.a@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-
-#ifndef FLAC_H
-#define FLAC_H
-
-#include "outformat.h"
-#include "configdialog.h"
-#include "ui_flac_config.h"
-
-class OutFormat_Flac: public OutFormat
-{
-public:
- OutFormat_Flac();
- bool check(QStringList *errors) const;
-
- virtual QString encoderProgramName() const { return "flac"; }
- virtual QString gainProgramName() const { return "metaflac"; }
-
- virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
- virtual QStringList gainArgs(const QStringList &files) const;
-
- QHash<QString, QVariant> defaultParameters() const;
- EncoderConfigPage *configPage(QWidget *parent = 0) const;
-};
-
-
-class ConfigPage_Flac: public EncoderConfigPage, private Ui::ConfigPage_Flac
-{
- Q_OBJECT
-public:
- explicit ConfigPage_Flac(QWidget *parent = 0);
-
- virtual void load();
- virtual void write();
-
-};
-
-#endif // FLAC_H

flacon-2.1.1.tar.gz/outformats/wav.cpp Deleted

@@ -1,138 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * Flacon - audio File Encoder
- * https://github.com/flacon/flacon
- *
- * Copyright: 2012-2013
- * Alexander Sokoloff <sokoloff.a@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-
-#include "wav.h"
-#include <QFile>
-
-
-/************************************************
-
- ************************************************/
-OutFormat_Wav::OutFormat_Wav()
-{
- mId = "WAV";
- mExt = "wav";
- mName = "WAV";
-}
-
-
-/************************************************
-
- ************************************************/
-QStringList OutFormat_Wav::encoderArgs(Track *track, const QString &outFile) const
-{
- return QStringList();
-}
-
-
-/************************************************
-
- ************************************************/
-QStringList OutFormat_Wav::gainArgs(const QStringList &files) const
-{
- return QStringList();
-}
-
-
-/************************************************
-
- ************************************************/
-Encoder *OutFormat_Wav::createEncoder(Track *track, QObject *parent) const
-{
- return new Encoder_Wav(this, track, parent);
-}
-
-
-/************************************************
-
- ************************************************/
-Gain *OutFormat_Wav::createGain(Disk *disk, Track *track, QObject *parent) const
-{
- return 0;
-}
-
-
-/************************************************
-
- ************************************************/
-QHash<QString, QVariant> OutFormat_Wav::defaultParameters() const
-{
- QHash<QString, QVariant> res;
- return res;
-}
-
-
-/************************************************
-
- ************************************************/
-EncoderConfigPage *OutFormat_Wav::configPage(QWidget *parent) const
-{
- return 0;
-}
-
-
-/************************************************
-
- ************************************************/
-Encoder_Wav::Encoder_Wav(const OutFormat *format, Track *track, QObject *parent):
- Encoder(format, track, parent)
-{
-}
-
-
-/************************************************
-
- ************************************************/
-void Encoder_Wav::doRun()
-{
- QFile srcFile(inputFile());
- QFile destFile(outFile());
-
- bool res = (!destFile.exists() || destFile.remove());
-
- if (res)
- res = srcFile.rename(outFile());
-
- if (!res)
- {
- error(track(),
- tr("I can't rename file:\n%1 to %2\n%3").arg(
- inputFile(),
- outFile(),
- srcFile.errorString()));
- }
-}
-
-
-/************************************************
-
- ************************************************/
-QStringList Encoder_Wav::processArgs() const
-{
- return QStringList();
-}
-
-

flacon-2.1.1.tar.gz/outformats/wav.h Deleted

@@ -1,66 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * Flacon - audio File Encoder
- * https://github.com/flacon/flacon
- *
- * Copyright: 2012-2013
- * Alexander Sokoloff <sokoloff.a@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-
-#ifndef WAV_H
-#define WAV_H
-
-#include "outformat.h"
-#include "encoder.h"
-
-class OutFormat_Wav: public OutFormat
-{
-public:
- OutFormat_Wav();
-
- virtual QString encoderProgramName() const { return ""; }
- virtual QString gainProgramName() const { return ""; }
-
- virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
- virtual QStringList gainArgs(const QStringList &files) const;
-
-
- QHash<QString, QVariant> defaultParameters() const;
- EncoderConfigPage *configPage(QWidget *parent = 0) const;
-
- virtual bool hasConfigPage() const { return false; }
-
- virtual Encoder *createEncoder(Track *track, QObject *parent = 0) const;
- virtual Gain *createGain(Disk *disk, Track *track, QObject *parent = 0) const;
-};
-
-
-class Encoder_Wav: public Encoder
-{
- Q_OBJECT
-public:
- explicit Encoder_Wav(const OutFormat *format, Track *track, QObject *parent = 0);
-
-protected:
- void doRun();
- virtual QStringList processArgs() const;
-};
-
-#endif // WAV_H

flacon-2.1.1.tar.gz/outformats/wv.cpp Deleted

@@ -1,144 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * Flacon - audio File Encoder
- * https://github.com/flacon/flacon
- *
- * Copyright: 2012-2013
- * Alexander Sokoloff <sokoloff.a@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-
-#include "wv.h"
-#include "settings.h"
-#include <QDebug>
-
-/************************************************
-
- ************************************************/
-OutFormat_Wv::OutFormat_Wv()
-{
- mId = "WV";
- mExt = "wv";
- mName = "WavPack";
-}
-
-
-/************************************************
-
- ************************************************/
-QStringList OutFormat_Wv::encoderArgs(Track *track, const QString &outFile) const
-{
- QStringList args;
-
- args << settings->programName(encoderProgramName());
-
- args << "-q"; // Suppress progress indicator
-
- // Settings .................................................
- int compression = settings->value("WV/Compression").toInt();
- if (compression == 0) args << "-f";
- if (compression == 1) args << "-h";
- if (compression == 2) args << "-hh";
-
- // Tags .....................................................
- if (!track->artist().isEmpty()) args << "-w" << QString("Artist=%1").arg(track->artist());
- if (!track->album().isEmpty()) args << "-w" << QString("Album=%1").arg(track->album());
- if (!track->genre().isEmpty()) args << "-w" << QString("Genre=%1").arg(track->genre());
- if (!track->date().isEmpty()) args << "-w" << QString("Year=%1").arg(track->date());
- if (!track->title().isEmpty()) args << "-w" << QString("Title=%1").arg(track->title());
- if (!track->disk()->discId().isEmpty()) args << "-w" << QString("DiscId=%1").arg(track->disk()->discId());
- if (!track->comment().isEmpty()) args << "-w" << QString("Comment=%1").arg(track->comment());
- args << "-w" << QString("Track=%1/%2").arg(track->trackNum()).arg(track->disk()->count());
-
- args << "-";
- args << "-o" << outFile;
-
- return args;
-}
-
-
-/************************************************
-
- ************************************************/
-QStringList OutFormat_Wv::gainArgs(const QStringList &files) const
-{
- QStringList args;
- args << args << settings->programName(gainProgramName());
- args << "-a";
- args << files;
-
- return args;
-}
-
-
-/************************************************
-
- ************************************************/
-QHash<QString, QVariant> OutFormat_Wv::defaultParameters() const
-{
- QHash<QString, QVariant> res;
- res.insert("WV/Compression", 1);
- res.insert("WV/ReplayGain", gainTypeToString(GainDisable));
- return res;
-}
-
-
-/************************************************
-
- ************************************************/
-EncoderConfigPage *OutFormat_Wv::configPage(QWidget *parent) const
-{
- return new ConfigPage_Wv(parent);
-}
-
-
-/************************************************
-
- ************************************************/
-ConfigPage_Wv::ConfigPage_Wv(QWidget *parent):
- EncoderConfigPage(parent)
-{
- setupUi(this);
-
- setLosslessToolTip(wvCompressionSlider);
- wvCompressionSpin->setToolTip(wvCompressionSlider->toolTip());
- fillReplayGainComboBox(wvGainCbx);
-}
-
-
-/************************************************
-
- ************************************************/
-void ConfigPage_Wv::load()
-{
- loadWidget("WV/Compression", wvCompressionSlider);
- loadWidget("WV/ReplayGain", wvGainCbx);
-}
-
-
-/************************************************
-
- ************************************************/
-void ConfigPage_Wv::write()
-{
- writeWidget("WV/Compression", wvCompressionSlider);
- writeWidget("WV/ReplayGain", wvGainCbx);
-}
-
-

flacon-2.1.1.tar.gz/outformats/wv.h Deleted

@@ -1,60 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * Flacon - audio File Encoder
- * https://github.com/flacon/flacon
- *
- * Copyright: 2012-2013
- * Alexander Sokoloff <sokoloff.a@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-
-#ifndef WV_H
-#define WV_H
-
-#include "outformat.h"
-#include "configdialog.h"
-#include "ui_wv_config.h"
-
-class OutFormat_Wv: public OutFormat
-{
-public:
- OutFormat_Wv();
-
- virtual QString encoderProgramName() const { return "wavpack"; }
- virtual QString gainProgramName() const { return "wvgain"; }
-
- virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
- virtual QStringList gainArgs(const QStringList &files) const;
-
- QHash<QString, QVariant> defaultParameters() const;
- EncoderConfigPage *configPage(QWidget *parent = 0) const;
-};
-
-
-class ConfigPage_Wv: public EncoderConfigPage, private Ui::ConfigPage_Wv
-{
- Q_OBJECT
-public:
- explicit ConfigPage_Wv(QWidget *parent = 0);
-
- virtual void load();
- virtual void write();
-};
-
-#endif // WV_H

flacon-2.1.1.tar.gz/.travis.yml -> flacon-3.1.1.tar.gz/.travis.yml Changed

flacon-2.1.1.tar.gz/CMakeLists.txt -> flacon-3.1.1.tar.gz/CMakeLists.txt Changed

@@ -27,7 +27,7 @@
 
 project(flacon)
 
-set(MAJOR_VERSION 2)
+set(MAJOR_VERSION 3)
 set(MINOR_VERSION 1)
 set(PATCH_VERSION 1)
 set(FLACON_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})
@@ -58,20 +58,25 @@
     gui/aboutdialog/translatorsinfo.h
     gui/cuediskselectdialog/cuediskselectdialog.h
 
+    converter/wavheader.h
+    converter/decoder.h
     converter/converterthread.h
     converter/converter.h
     converter/splitter.h
     converter/encoder.h
     converter/gain.h
 
-    outformats/outformat.h
-    outformats/aac.h
-    outformats/flac.h
-    outformats/mp3.h
-    outformats/ogg.h
-    outformats/wav.h
-    outformats/wv.h
-    outformats/opus.h
+    formats/format.h
+    formats/outformat.h
+    formats/aac.h
+    formats/flac.h
+    formats/mp3.h
+    formats/ogg.h
+    formats/wav.h
+    formats/wv.h
+    formats/opus.h
+    formats/ape.h
+    formats/tta.h
 )
 
 set(SOURCES
@@ -95,20 +100,25 @@
     gui/aboutdialog/translatorsinfo.cpp
     gui/cuediskselectdialog/cuediskselectdialog.cpp
 
+    converter/wavheader.cpp
+    converter/decoder.cpp
     converter/converterthread.cpp
     converter/converter.cpp
     converter/splitter.cpp
     converter/encoder.cpp
     converter/gain.cpp
 
-    outformats/outformat.cpp
-    outformats/aac.cpp
-    outformats/flac.cpp
-    outformats/mp3.cpp
-    outformats/ogg.cpp
-    outformats/wav.cpp
-    outformats/wv.cpp
-    outformats/opus.cpp
+    formats/format.cpp
+    formats/outformat.cpp
+    formats/aac.cpp
+    formats/flac.cpp
+    formats/mp3.cpp
+    formats/ogg.cpp
+    formats/wav.cpp
+    formats/wv.cpp
+    formats/opus.cpp
+    formats/ape.cpp
+    formats/tta.cpp
 )
 
 set (MOCS
@@ -128,19 +138,20 @@
     gui/aboutdialog/aboutdialog.h
     gui/cuediskselectdialog/cuediskselectdialog.h
 
+    converter/decoder.h
     converter/converterthread.h
     converter/converter.h
     converter/splitter.h
     converter/encoder.h
     converter/gain.h
 
-    outformats/aac.h
-    outformats/flac.h
-    outformats/mp3.h
-    outformats/ogg.h
-    outformats/wav.h
-    outformats/wv.h
-    outformats/opus.h
+    formats/aac.h
+    formats/flac.h
+    formats/mp3.h
+    formats/ogg.h
+    formats/wav.h
+    formats/wv.h
+    formats/opus.h
 )
 
 set (FORMS
@@ -149,12 +160,12 @@
     gui/aboutdialog/aboutdialog.ui
     gui/cuediskselectdialog/cuediskselectdialog.ui
 
-    outformats/flac_config.ui
-    outformats/aac_config.ui
-    outformats/mp3_config.ui
-    outformats/ogg_config.ui
-    outformats/wv_config.ui
-    outformats/opus_config.ui
+    formats/flac_config.ui
+    formats/aac_config.ui
+    formats/mp3_config.ui
+    formats/ogg_config.ui
+    formats/wv_config.ui
+    formats/opus_config.ui
 )
 
 set(LIBRARIES
@@ -192,7 +203,7 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
-    outformats
+    formats
     converter
     gui
     gui/configdialog
@@ -206,16 +217,17 @@
 
 if((USE_QT4 AND USE_QT5) OR
    (NOT USE_QT4 AND NOT USE_QT5))
-    find_package(Qt4 QUIET)
-    if (QT4_FOUND)
-        set(USE_QT4 ON)
-        set(USE_QT5 OFF)
-    else()
+    find_package(Qt5Core QUIET)
+    if (Qt5Core_FOUND)
         set(USE_QT4 OFF)
         set(USE_QT5 ON)
+    else()
+        set(USE_QT4 ON)
+        set(USE_QT5 OFF)
     endif()
 endif()
 
+
 if(USE_QT4)
     set(QT_USE_QTNETWORK 1)
     find_package(Qt4 REQUIRED)
@@ -305,12 +317,8 @@
 install(FILES   ${QM_FILES}             DESTINATION ${TRANSLATIONS_DIR})
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 
-if(BUILD_TESTS STREQUAL "Yes")
-    add_definitions(-DBUILD_TESTS)
-    add_subdirectory(tests)
-else()
-    status_message("For building tests use -DBUILD_TESTS=Yes option.")
-endif()
+
+addTests(tests)
 
 
 # Man page **************************************

flacon-2.1.1.tar.gz/converter/converter.cpp -> flacon-3.1.1.tar.gz/converter/converter.cpp Changed

@@ -46,7 +46,8 @@
 ************************************************/
 Converter::Converter(QObject *parent) :
 QObject(parent),
- mThreadCount(0)
+ mThreadCount(0),
+ mShowStatistic(true)
 {
 }
 
@@ -122,7 +123,7 @@
 ************************************************/
 void Converter::createDiscThreads(Disk *disk, const OutFormat *format)
 {
- Splitter *splitter = new Splitter(disk);
+ Splitter *splitter = new Splitter(disk, format);
 mThreads << splitter;
 
 Gain *albumGain = 0;
@@ -246,6 +247,15 @@
 /************************************************
 
 ************************************************/
+void Converter::setShowStatistic(bool value)
+{
+ mShowStatistic = value;
+}
+
+
+/************************************************
+
+ ************************************************/
 void Converter::stop()
 {
 if (!isRunning())
@@ -345,24 +355,27 @@
 {
 emit finished();
 
- int duration = QDateTime::currentDateTime().toTime_t() - mStartTime.toTime_t();
- if (!duration)
- duration = 1;
+ if (mShowStatistic)
+ {
+ int duration = QDateTime::currentDateTime().toTime_t() - mStartTime.toTime_t();
+ if (!duration)
+ duration = 1;
 
- int h = duration / 3600;
- int m = (duration - (h * 3600)) / 60;
- int s = duration - (h * 3600) - (m * 60);
+ int h = duration / 3600;
+ int m = (duration - (h * 3600)) / 60;
+ int s = duration - (h * 3600) - (m * 60);
 
- QString str;
+ QString str;
 
- if (h)
- str = QString("Encoding time %4h %3m %2s [%1 sec]").arg(duration).arg(s).arg(m).arg(h);
- else if (m)
- str = QString("Encoding time %3m %2s [%1 sec]").arg(duration).arg(s).arg(m);
- else
- str = QString("Encoding time %1 sec").arg(duration);
+ if (h)
+ str = QString("Encoding time %4h %3m %2s [%1 sec]").arg(duration).arg(s).arg(m).arg(h);
+ else if (m)
+ str = QString("Encoding time %3m %2s [%1 sec]").arg(duration).arg(s).arg(m);
+ else
+ str = QString("Encoding time %1 sec").arg(duration);
 
- std::cout << str.toLocal8Bit().constData() << std::endl;
+ std::cout << str.toLocal8Bit().constData() << std::endl;
+ }
 
 qDeleteAll(mThreads);
 mThreads.clear();

flacon-2.1.1.tar.gz/converter/converter.h -> flacon-3.1.1.tar.gz/converter/converter.h Changed

flacon-2.1.1.tar.gz/converter/converterthread.cpp -> flacon-3.1.1.tar.gz/converter/converterthread.cpp Changed

flacon-2.1.1.tar.gz/converter/converterthread.h -> flacon-3.1.1.tar.gz/converter/converterthread.h Changed

flacon-3.1.1.tar.gz/converter/decoder.cpp Added

@@ -0,0 +1,335 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "decoder.h"
+#include "../cue.h"
+#include "../settings.h"
+
+#include <QIODevice>
+#include <QFile>
+#include <QProcess>
+#include <QDir>
+#include <QDebug>
+
+#define MAX_BUF_SIZE 4096
+
+
+
+/************************************************
+ *
+ ************************************************/
+qint64 timeToBytes(CueTime time, WavHeader wav)
+{
+ if (wav.isCdQuality())
+ {
+ return (qint64)((((double)time.frames() * (double)wav.byteRate()) / 75.0) + 0.5);
+ }
+ else
+ {
+ return (qint64)((((double)time.milliseconds() * (double)wav.byteRate()) / 1000.0) + 0.5);
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+Decoder::Decoder(QObject *parent) :
+ QObject(parent),
+ mFormat(NULL),
+ mProcess(NULL),
+ mFile(NULL),
+ mPos(0)
+{
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+Decoder::Decoder(const AudioFormat &format, QObject *parent) :
+ QObject(parent),
+ mFormat(&format),
+ mProcess(NULL),
+ mFile(NULL),
+ mPos(0)
+{
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+Decoder::~Decoder()
+{
+ close();
+ delete mFile;
+ delete mProcess;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool Decoder::open(const QString fileName)
+{
+ mInputFile = fileName;
+ if (!mFormat)
+ mFormat = AudioFormat::formatForFile(fileName);
+
+ if (!mFormat)
+ {
+ mErrorString = "Unknown format";
+ return false;
+ }
+
+ if (!mFormat->decoderProgramName().isEmpty())
+ return openProcess();
+ else
+ return openFile();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool Decoder::openFile()
+{
+ mFile = new QFile(mInputFile, this);
+ if (!mFile->open(QFile::ReadOnly))
+ {
+ mErrorString = mFile->errorString();
+ return false;
+ }
+
+ try
+ {
+ mWavHeader.load(mFile);
+ mPos = mWavHeader.dataStartPos();
+ return true;
+ }
+ catch (char const *err)
+ {
+ mErrorString = err;
+ return false;
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool Decoder::openProcess()
+{
+ mProcess = new QProcess(this);
+
+ QString program = settings->programName(mFormat->decoderProgramName());
+ mProcess->setReadChannel(QProcess::StandardOutput);
+ connect(mProcess, SIGNAL(readyReadStandardError()),
+ this, SLOT(readStandardError()));
+
+
+ mProcess->start(QDir::toNativeSeparators(program), mFormat->decoderArgs(mInputFile));
+ bool res = mProcess->waitForStarted();
+ if(!res)
+ {
+ mErrorString = QString("[Decoder] Can't start '%1': %2").arg(program, mProcess->errorString());
+ return false;
+ }
+
+
+ try
+ {
+ mWavHeader.load(mProcess);
+ mPos = mWavHeader.dataStartPos();
+ return true;
+ }
+ catch (char const *err)
+ {
+ mErrorString = err;
+ return false;
+ }
+}
+
+/************************************************
+ *
+ ************************************************/
+void Decoder::close()
+{
+ if (mFile)
+ mFile->close();
+
+ if (mProcess)
+ {
+ mProcess->terminate();
+ mProcess->waitForFinished();
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool Decoder::extract(const CueTime &start, const CueTime &end, QIODevice *outDevice)
+{

flacon-3.1.1.tar.gz/converter/decoder.h Added

@@ -0,0 +1,83 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef DECODER_H
+#define DECODER_H
+
+#include "wavheader.h"
+#include <QObject>
+#include <QString>
+#include <QByteArray>
+#include "../cue.h"
+#include "../formats/format.h"
+
+class QIODevice;
+class QProcess;
+
+class Decoder : public QObject
+{
+ Q_OBJECT
+public:
+ explicit Decoder(QObject *parent = 0);
+ explicit Decoder(const AudioFormat &format, QObject *parent = 0);
+ virtual ~Decoder();
+
+ bool open(const QString fileName);
+ void close();
+
+ bool extract(const CueTime &start, const CueTime &end, QIODevice *outDevice);
+ bool extract(const CueTime &start, const CueTime &end, const QString &outFileName);
+
+ // Duration of audio in milliseconds.
+ uint duration() const { return mWavHeader.duration(); }
+
+ QString errorString() const { return mErrorString; }
+
+ WavHeader wavHeader() const { return mWavHeader; }
+
+signals:
+ void progress(int percent);
+
+private slots:
+ void readStandardError();
+
+private:
+ const AudioFormat *mFormat;
+ QProcess *mProcess;
+ QString mInputFile;
+ QFile *mFile;
+ WavHeader mWavHeader;
+ QString mErrorString;
+ quint64 mPos;
+ QByteArray mErrBuff;
+
+ bool openFile();
+ bool openProcess();
+};
+
+
+
+#endif // DECODER_H

flacon-2.1.1.tar.gz/converter/encoder.cpp -> flacon-3.1.1.tar.gz/converter/encoder.cpp Changed

flacon-2.1.1.tar.gz/converter/encoder.h -> flacon-3.1.1.tar.gz/converter/encoder.h Changed

flacon-2.1.1.tar.gz/converter/gain.cpp -> flacon-3.1.1.tar.gz/converter/gain.cpp Changed

flacon-2.1.1.tar.gz/converter/gain.h -> flacon-3.1.1.tar.gz/converter/gain.h Changed

flacon-2.1.1.tar.gz/converter/splitter.cpp -> flacon-3.1.1.tar.gz/converter/splitter.cpp Changed

@@ -29,6 +29,7 @@
 #include "project.h"
 #include "disk.h"
 #include "inputaudiofile.h"
+#include "decoder.h"
 
 #include <iostream>
 #include <QFileInfo>
@@ -37,6 +38,7 @@
 #include <QProcess>
 #include <QRegExp>
 #include <QTextCodec>
+#include <QUuid>
 #include <QDebug>
 
 //#define DEBUG_CUE_ON
@@ -81,10 +83,10 @@
 /************************************************
 
 ************************************************/
-Splitter::Splitter(Disk *disk, QObject *parent):
- ConverterThread(disk, parent),
+Splitter::Splitter(Disk *disk, const OutFormat *format, QObject *parent):
+ ConverterThread(disk, format, parent),
 mProcess(0),
- mPreGapExists(false)
+ mTrack(NULL)
 { 
 QString tmpDir = settings->value(Settings::Encoder_TmpDir).toString();
 
@@ -92,8 +94,6 @@
 mWorkDir = QFileInfo(disk->track(0)->resultFilePath()).dir().absolutePath();
 else
 mWorkDir = QDir(QString("%1/flacon.%2").arg(tmpDir).arg(QCoreApplication::applicationPid())).absolutePath();
-
- mFilePrefix = QString("tmp-%1-%2.").arg(QCoreApplication::applicationPid()).arg(project->indexOf(disk));
 }
 
 
@@ -128,190 +128,105 @@
 }
 }
 
+struct SplitterRequest {
+ CueTime start;
+ CueTime end;
+ QString outFileName;
+ Track *track;
+};
 
 /************************************************
 Split audio file to temporary dir
 ************************************************/
 void Splitter::doRun()
 {
- QStringList args;
- args << "split";
- args << "-w";
- args << "-O" << "always";
- args << "-n" << "%04d";
- args << "-t" << mFilePrefix +"%n";
- args << "-d" << mWorkDir;
- args << QDir::toNativeSeparators(disk()->audioFileName());
- //qDebug() << args;
+ mTrack = disk()->track(0);
+ Decoder decoder;
+ connect(&decoder, SIGNAL(progress(int)),
+ this, SLOT(decoderProgress(int)));
 
- QString shntool = settings->value(Settings::Prog_Shntool).toString();
- mProcess = new QProcess();
- mProcess->setReadChannel(QProcess::StandardError);
+ if (!decoder.open(disk()->audioFileName()))
+ {
+ error(mTrack,
+ tr("I can't read %1: %2",
+ "Splitter error. %1 is a file name, %2 is a system error text.")
+ .arg(disk()->audioFileName())
+ .arg(decoder.errorString()));
+ return;
+ }
 
- mProcess->start(QDir::toNativeSeparators(shntool), args);
- mProcess->waitForStarted();
+ bool separatePregap = format()->createCue() &&
+ disk()->track(0)->cueIndex(1).milliseconds() > 0 &&
+ OutFormat::currentFormat()->preGapType() == OutFormat::PreGapExtractToFile;
 
- sendCueData();
- mProcess->closeWriteChannel();
 
- parseOut();
- mProcess->waitForFinished(-1);
+ bool embededPregap = format()->createCue() &&
+ disk()->track(0)->cueIndex(1).milliseconds() > 0 &&
+ OutFormat::currentFormat()->preGapType() == OutFormat::PreGapAddToFirstTrack;
 
- QProcess *proc = mProcess;
- mProcess = 0;
- delete proc;
+ QList<SplitterRequest> requests;
 
- if (OutFormat::currentFormat()->createCue())
+
+ // Extract pregap to separate file ....................
+ if (separatePregap)
 {
- CueCreator cue(disk());
- cue.setHasPregapFile(mPreGapExists);
- if (!cue.write())
- error(disk()->track(0), cue.errorString());
+ SplitterRequest req;
+ req.track = disk()->preGapTrack();
+ req.outFileName = QDir::toNativeSeparators(QString("%1/flacon_%2_%3.wav").arg(mWorkDir).arg("00").arg(QUuid::createUuid().toString().mid(1, 36)));
+ req.start = disk()->track(0)->cueIndex(0);
+ req.end = disk()->track(0)->cueIndex(1);
+ requests << req;
 }
-}
+ // Extract pregap to separate file ....................
 
-/************************************************
+ for (int i=0; i<disk()->count(); ++i)
+ {
+ SplitterRequest req;
+ req.track = disk()->track(i);
+ req.outFileName = QDir::toNativeSeparators(QString("%1/flacon_%2_%3.wav").arg(mWorkDir).arg(i, 2, 10, QChar('0')).arg(QUuid::createUuid().toString().mid(1, 36)));
 
- ************************************************/
+ if (i==0 && embededPregap)
+ req.start = CueTime("00:00:00");
+ else
+ req.start = disk()->track(i)->cueIndex(1);
 
-void Splitter::parseOut()
-{
- Track *track = disk()->track(0);
+ if (i<disk()->count()-1)
+ req.end = disk()->track(i+1)->cueIndex(01);
 
- bool deletePregap = !OutFormat::currentFormat()->createCue();
- char c;
- QByteArray buf;
+ requests << req;
+ }
 
- while(mProcess->waitForReadyRead(-1))
+ foreach (SplitterRequest req, requests)
 {
- while (mProcess->read(&c, 1))
+ mTrack = req.track;
+ bool ret = decoder.extract(req.start, req.end, req.outFileName);
+ if (!ret)
 {
- // .......................................
- if (c == '\n')
- {
- if (buf.contains(": error:"))
- {
- error(track, QString::fromLocal8Bit(buf.mid(17)));
- return;
- }
- buf = "";
- }
-
-
- // .......................................
- else if (c == '%')
- {
- bool ok;
- int percent = buf.right(3).trimmed().toInt(&ok);
- if (!ok)
- continue;
-
-
- // Splitting [/home/user/inDir/input.wav] (10:00.000) --> [/home/user/outDir/tmp-15196-00000.wav] (0:00.440) : 100% OK
-
- QString pattern = "[" + mWorkDir + QDir::separator() + mFilePrefix;
- pattern.replace('\\', '/');
- QString sbuf = QString::fromLocal8Bit(buf);
- int n = sbuf.indexOf(pattern, disk()->audioFileName().length() + 20);
-
- if (n < 0 && sbuf.length() < n + pattern.length() + 4)
- {
- qWarning() << "I can't parse" << sbuf;
- continue;
- }
-
- QString fileName = sbuf.mid(n + 1, + pattern.length() - 1 + 4 + 4); // -1 for leading "[", 4 for 4 digits tracknum, 4 - file ext ".wav"
-
- int trackNum = fileName.mid(fileName.length() - 8, 4).toInt(&ok);
-
- if (!ok)
- {
- qWarning() << "I can't parse" << sbuf;
- continue;
- }
-
-
-

flacon-2.1.1.tar.gz/converter/splitter.h -> flacon-3.1.1.tar.gz/converter/splitter.h Changed

flacon-3.1.1.tar.gz/converter/wavheader.cpp Added

@@ -0,0 +1,474 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2012-2013
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "wavheader.h"
+
+#include <QByteArray>
+#include <QtEndian>
+#include <QDebug>
+
+#define WAV_RIFF "RIFF"
+#define WAV_WAVE "WAVE"
+#define WAV_FMT "fmt "
+#define WAV_DATA "data"
+
+#define CD_NUM_CHANNELS 2
+#define CD_BITS_PER_SAMPLE 16
+#define CD_SAMPLE_RATE 44100
+#define CD_BYTE_RATE 176400
+#define CD_BLOCK_SIZE 2352
+
+#define CANONICAL_HEADER_SIZE 44
+#define BUF_SIZE 4096
+
+
+/************************************************
+ *
+ ************************************************/
+inline bool mustRead(QIODevice *device, char *data, qint64 size, int msecs)
+{
+ char *d = data;
+ qint64 left = size;
+ while (device->bytesAvailable() || device->waitForReadyRead(msecs))
+ {
+ qint64 n = device->read(d, left);
+
+ if (n==left)
+ return true;
+
+ d+=n;
+ left-=n;
+ }
+
+ return false;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool mustSkip(QIODevice *device, qint64 size, int msecs)
+{
+ if (size == 0)
+ return true;
+
+ char buf[BUF_SIZE];
+ qint64 left = size;
+ while (device->bytesAvailable() || device->waitForReadyRead(msecs))
+ {
+ left -= device->read(buf, qMin(left, qint64(BUF_SIZE)));
+
+ if (!left)
+ return true;
+ }
+
+ return false;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool readTag(QIODevice *device, char tag[5])
+{
+ tag[4] = '\0';
+ return mustRead(device, tag, 4);
+}
+
+
+struct SplitterError {
+ int trackNum;
+ QString msg;
+
+ SplitterError(int num, QString msg):
+ trackNum(num),
+ msg(msg)
+ {
+ }
+};
+
+
+/************************************************
+ *
+ ************************************************/
+quint32 readUInt32(QIODevice *stream)
+{
+ quint32 n;
+ if (stream->read((char*)&n, 4) != 4)
+ throw "Unexpected end of file";
+ return qFromLittleEndian(n);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+quint16 readUInt16(QIODevice *stream)
+{
+ quint16 n;
+ if (stream->read((char*)&n, 2) != 2)
+ throw "Unexpected end of file";
+ return qFromLittleEndian(n);
+}
+
+
+/************************************************
+ * 52 49 46 46 RIFF
+ * 24 B9 4D 02 file size - 8
+ * 57 41 56 45 WAVE
+ *
+ * // Chanks
+ * 66 6D 74 20 SubchunkID "fmt "
+ * 10 00 00 00 SubchunkSize 16
+ * 01 00 AudioFormat PCM
+ * 02 00	 NumChannels 2
+ * 44 AC 00 00 SampleRate 44100
+ * 10 B1 02 00 ByteRate 176400
+ * 04 00 BlockAlign 4
+ * 10 00 BitsPerSample 16
+ * // Data
+ * 64 61 74 61 	SubchunkID 		"data"
+ * 00 B9 4D 02 	SubchunkSize
+ ************************************************/
+WavHeader::WavHeader():
+ mFileSize(0),
+ mFormat(WavHeader::Format_Unknown),
+ mNumChannels(0),
+ mSampleRate(0),
+ mByteRate(0),
+ mBlockAlign(0),
+ mBitsPerSample(0),
+ mDataSize(0),
+ mDataStartPos(0)
+{
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool WavHeader::isCdQuality() const
+{
+ return mNumChannels == CD_NUM_CHANNELS &&
+ mBitsPerSample == CD_BITS_PER_SAMPLE &&
+ mSampleRate == CD_SAMPLE_RATE &&
+ mByteRate == CD_BYTE_RATE;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+quint64 WavHeader::duration() const
+{
+ return (mDataSize * 1000ull) / mByteRate;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+StdWavHeader::StdWavHeader(quint32 dataSize, const WavHeader &base):
+ WavHeader()
+{
+ mDataSize = dataSize;
+ mDataStartPos = CANONICAL_HEADER_SIZE;
+ mFileSize = mDataStartPos + mDataSize;

flacon-3.1.1.tar.gz/converter/wavheader.h Added

@@ -0,0 +1,127 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2012-2013
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef WAVHEADER_H
+#define WAVHEADER_H
+
+#include <QtGlobal>
+#include <QIODevice>
+
+class WavHeader {
+public:
+ enum Format{
+ Format_Unknown = 0x0000,
+ Format_PCM = 0x0001,
+ Format_ADPCM = 0x0002,
+ Format_IEEE_FLOAT = 0x0003,
+ Format_ALAW = 0x0006,
+ Format_MULAW = 0x0007,
+ Format_OKI_ADPCM = 0x0010,
+ Format_IMA_ADPCM = 0x0011,
+ Format_DIGISTD = 0x0015,
+ Format_DIGIFIX = 0x0016,
+ Format_DOLBY_AC2 = 0x0030,
+ Format_GSM610 = 0x0031,
+ Format_ROCKWELL_ADPCM = 0x003b,
+ Format_ROCKWELL_DIGITALK = 0x003c,
+ Format_G721_ADPCM = 0x0040,
+ Format_G728_CELP = 0x0041,
+ Format_MPEG = 0x0050,
+ Format_MPEGLAYER3 = 0x0055,
+ Format_G726_ADPCM = 0x0064,
+ Format_G722_ADPCM = 0x0065
+
+ };
+
+
+ WavHeader();
+
+ quint32 fileSize() const { return mFileSize; }
+ Format format() const { return mFormat; }
+ quint16 numChannels() const { return mNumChannels; }
+ quint32 sampleRate() const { return mSampleRate; }
+ quint32 byteRate() const { return mByteRate; }
+ quint16 blockAlign() const { return mBlockAlign; }
+ quint16 bitsPerSample() const { return mBitsPerSample; }
+ quint32 dataSize() const { return mDataSize; }
+ quint32 dataStartPos() const { return mDataStartPos; }
+ bool isCdQuality() const;
+
+ /// Duration of audio in milliseconds.
+ quint64 duration() const;
+
+ void load(QIODevice* stream);
+
+ QByteArray toByteArray() const;
+
+protected:
+ quint32 mFileSize;
+ Format mFormat;
+ quint16 mNumChannels;
+ quint32 mSampleRate;
+ quint32 mByteRate;
+ quint16 mBlockAlign;
+ quint16 mBitsPerSample;
+ quint32 mDataSize;
+ quint32 mDataStartPos;
+
+private:
+
+};
+
+QDebug operator<<(QDebug dbg, const WavHeader &header);
+
+class StdWavHeader: public WavHeader
+{
+public:
+ enum Quality {
+ Quality_Stereo_CD = 2 * 16 * 44100,
+ Quality_Stereo_24_96 = 2 * 24 * 96000,
+ Quality_Stereo_24_192 = 2 * 24 * 192000
+
+ };
+ StdWavHeader(quint32 dataSize, const WavHeader &base);
+
+ /**
+ * dataSize - This is the number of bytes in the audio data. NumSamples * NumChannels * BitsPerSample/8
+ * sampleRate - 8000, 44100, etc.
+ * bitsPerSample - 8 bits = 8, 16 bits = 16, etc.
+ * numChannels - Mono = 1, Stereo = 2, etc.
+ */
+ explicit StdWavHeader(quint32 dataSize, quint32 sampleRate, quint16 bitsPerSample, quint8 numChannels);
+
+
+ explicit StdWavHeader(quint32 dataSize, Quality quality);
+
+ static quint32 bytesPerSecond(Quality quality);
+};
+
+#define READ_DELAY 1000
+inline bool mustRead(QIODevice *device, char *data, qint64 size, int msecs = READ_DELAY);
+bool mustSkip(QIODevice *device, qint64 size, int msecs = READ_DELAY);
+
+
+#endif // WAVHEADER_H

flacon-2.1.1.tar.gz/cue.cpp -> flacon-3.1.1.tar.gz/cue.cpp Changed

flacon-2.1.1.tar.gz/cue.h -> flacon-3.1.1.tar.gz/cue.h Changed

flacon-3.1.1.tar.gz/cuesheet_syntax.md Added

@@ -0,0 +1,356 @@
+Cue-Sheet Syntax
+================
+
+
+[CATALOG](#catalog) | [CDTEXTFILE](#cdtextfile) | [FILE](#file) | [FLAGS](#flags) | [INDEX](#index) | [ISRC](#isrc) | [PERFORMER](#performer) | [POSTGAP](#postgap) | [PREGAP](#pregap) | [REM](#rem) | [SONGWRITER](#songwriter) | [TITLE](#title) |  [TRACK](#track)
+
+
+
+CATALOG
+-------
+
+**Description:**
+This command is used to specify the disc's "Media Catalog Number". It will typically be used only when mastering a CDROM for commercial production.
+
+**Syntax:**
+```
+CATALOG [media-catalog-number]
+```
+
+**Examples:**
+```
+CATALOG 1234567890123
+CATALOG 8340218374610
+```
+
+**Rules:**
+The catalog number must be 13 digits long and is encoded according to UPC/EAN rules. This command can appear only once in the CUE SHEET file (it will usually be the first line, but this is not mandatory).
+
+
+
+
+CDTEXTFILE
+----------
+
+**Description:**
+This command is used to specify the name of the file that contains the encoded CD-TEXT information for the disc. This command is only used with files that were either created with the graphical CD-TEXT editor or generated automatically by the software when copying a CD-TEXT enhanced disc.
+
+**Syntax:**
+```
+CDTEXTFILE [filename]
+```
+
+**Parameters:**
+  * **filename** – Filename (can include device/directory). If the filename contains any spaces, then it must be enclosed in quotation marks.
+
+**Examples:**
+```
+CDTEXTFILE C:\TEST\DISC.CDT
+CDTEXTFILE "C:\LONG FILENAME.CDT"
+```
+
+**Rules:**
+If your recorder does not support CD-TEXT, then this command will be ignored.
+
+
+
+
+FILE
+----
+
+**Description:**
+This command is used to specify a data/audio file that will be written to the recorder.
+
+**Syntax:**
+```
+FILE [filename] [filetype]
+```
+
+**Parameters:**
+ * **filename** – Filename (can include device/directory). If the filename contains any spaces, then it must be enclosed in quotation marks.
+ * **filetype** – Filetype The following filetypes are allowed…
+   * *BINARY* – Intel binary file (least significant byte first)
+   * *MOTOROLA* – Motorola binary file (most significant byte first)
+   * *AIFF* – Audio AIFF file
+   * *WAVE* – Audio WAVE file
+   * *MP3* – Audio MP3 file
+
+**Note:**
+All audio files (WAVE, AIFF, and MP3) must be in 44.1KHz 16-bit stereo format.
+
+**Examples:**
+```
+FILE "C:\DATA\TRACK1.ISO" BINARY
+FILE "C:\MUSIC\TRACK2.WAV" WAVE
+FILE "C:\MUSIC\LONG FILENAME.MP3″ MP3
+```
+
+**Rules:**
+FILE commands must appear before any other command except CATALOG. This rule contradicts the examples on this site: Note.
+
+**Note:**
+For AUDIO files, if the length of the data within the file is not an exact multiple of the CDROM sector size (2352 bytes), then the last sector will be padded with zeros when it is recorded to the blank disc.
+
+
+
+FLAGS
+-----
+
+**Description:**
+This command is used to set special subcode flags within a track. These flags are rarely used on any discs made today.
+
+**Syntax:**
+```
+FLAGS [flags]
+```
+
+**Parameters:**
+
+ * **flags** – Specifies one or more track flags. The following flags are allowed…
+   * *DCP* – Digital copy permitted
+   * *4CH* – Four channel audio
+   * *PRE* – Pre-emphasis enabled (audio tracks only)
+   * *SCMS* – Serial copy management system (not supported by all recorders)
+
+**Example:**
+```
+FLAGS DCP
+FLAGS 4CH PRE
+```
+
+**Rules:**
+The FLAGS command must appear after a TRACK command, but before any INDEX commands. Only one FLAGS command is allowed per track.
+
+**Note:**
+There is a fourth subcode flag called "DATA" which is set for all non-audio tracks. This flag is set automatically based on the datatype of the track.
+
+
+
+INDEX
+-----
+
+**Description:**
+This command is used to specify indexes (or subindexes) within a track.
+
+**Syntax:**
+```
+INDEX [number] [mm:ss:ff]
+```
+
+**Parameters:**
+  * **number** – Index number (0-99)
+  * **mm:ss:ff** – Starting time in minutes, seconds, and frames (75 frames/second).
+
+**Note:**
+All times are relative to the beginning of the current file.
+
+**Example:**
+```
+INDEX 01 00:00:00
+INDEX 05 02:34:50
+```
+
+**Rules:**
+All index numbers must be between 0 and 99 inclusive. The first index must be 0 or 1 with all other indexes being sequential to the first one. The first index of a file must start at 00:00:00.
+
+*INDEX 0* Specifies the starting time of the track "pregap".
+
+*INDEX 1* Specifies the starting time of the track data. This is the only index that is stored in the disc’s table-of-contents.
+
+*INDEX > 1* Specifies a subindex within a track.
+
+
+
+ISRC
+----
+
+**Description:**
+This command is used to specify a track’s "International Standard Recording Code" (ISRC). It will typically be used only when mastering a CD for commercial disc production.
+
+**Syntax:**
+```
+ISRC (code)
+```
+
+**Example:**
+```
+ISRC ABCDE1234567
+```
+
+**Rules:**
+The ISRC must be 12 characters in length. The first five characters are alphanumeric, but the last seven are numeric only. If it is used, the ISRC command must be specified after a TRACK command, but before any INDEX commands.
+
+
+
+PERFORMER
+---------
+
+**Description:**
+This command is used to specify the name of a perfomer for a CD-TEXT enhanced disc.
+
+**Syntax:**
+```
+PERFORMER [performer-string]
+```
+
+**Parameters:**
+  * **performer-string** – Name of performer. If the string contains any spaces, then it must be enclosed in quotation marks. Strings should be limited to 80 character or less.
+
+**Example:**

flacon-2.1.1.tar.gz/disk.cpp -> flacon-3.1.1.tar.gz/disk.cpp Changed

@@ -28,6 +28,7 @@
 #include "settings.h"
 #include "project.h"
 #include "inputaudiofile.h"
+#include "formats/format.h"
 #include "outformat.h"
 #include "internet/dataprovider.h"
 
@@ -527,8 +528,8 @@
 }
 
 QString audioExt;
- foreach (InputAudioFormat format, InputAudioFormat::allFormats())
- audioExt += (audioExt.isEmpty() ? "\\." : "|\\.") + format.ext();
+ foreach (const AudioFormat *format, AudioFormat::inputFormats())
+ audioExt += (audioExt.isEmpty() ? "\\." : "|\\.") + format->ext();
 
 foreach (const QString &pattern, patterns)
 {
@@ -620,8 +621,8 @@
 return;
 
 QStringList exts;
- foreach (InputAudioFormat format, InputAudioFormat::allFormats())
- exts << QString("*.%1").arg(format.ext());
+ foreach (const AudioFormat *format, AudioFormat::inputFormats())
+ exts << QString("*.%1").arg(format->ext());
 
 QFileInfo cueFile(mCueFile);
 QFileInfoList files = cueFile.dir().entryInfoList(exts, QDir::Files | QDir::Readable);

flacon-3.1.1.tar.gz/doc Added

flacon-3.1.1.tar.gz/doc/WavPack5FileFormat.pdf Added

flacon-3.1.1.tar.gz/formats Added

flacon-3.1.1.tar.gz/formats/aac.cpp Changed

flacon-3.1.1.tar.gz/formats/aac.h Changed

flacon-3.1.1.tar.gz/formats/aac_config.ui Changed

flacon-3.1.1.tar.gz/formats/ape.cpp Added

@@ -0,0 +1,62 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "ape.h"
+
+REGISTER_FORMAT(Format_Ape)
+
+
+/************************************************
+ *
+ ************************************************/
+QStringList Format_Ape::decoderArgs(const QString &fileName) const
+{
+ QStringList args;
+ args << fileName;
+ args << "-";
+ args << "-d";
+
+ return args;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QString Format_Ape::filterDecoderStderr(const QString &stdErr) const
+{
+ if (stdErr.startsWith("Progress:"))
+ return "";
+
+ if (stdErr.contains("-- Monkey's Audio Console Front End"))
+ return "";
+
+ if (stdErr.startsWith("Decompressing..."))
+ return "";
+
+ return stdErr;
+
+}

flacon-3.1.1.tar.gz/formats/ape.h Added

@@ -0,0 +1,52 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef APE_H
+#define APE_H
+
+#include "format.h"
+
+class Format_Ape: public AudioFormat
+{
+public:
+ virtual QString name() const { return "APE"; }
+ virtual QString ext() const { return "ape"; }
+ virtual bool isInputFormat() const { return true; }
+
+ virtual QByteArray magic() const { return "MAC "; }
+ virtual uint const magicOffset() const { return 0; }
+
+
+ virtual QString decoderProgramName() const { return "mac"; }
+ virtual QStringList decoderArgs(const QString &fileName) const;
+ virtual QString filterDecoderStderr(const QString &stdErr) const;
+
+ virtual bool isOutputFormat() const { return false; }
+
+
+};
+
+#endif // APE_H

flacon-3.1.1.tar.gz/formats/flac.cpp Added

@@ -0,0 +1,195 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2012-2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "flac.h"
+#include "settings.h"
+#include "project.h"
+#include "inputaudiofile.h"
+
+#include <QDebug>
+
+REGISTER_FORMAT(Format_Flac)
+
+
+/************************************************
+ *
+ ************************************************/
+QStringList Format_Flac::decoderArgs(const QString &fileName) const
+{
+ QStringList args;
+ args << "-c";
+ args << "-d";
+ args << "-s";
+ args << fileName;
+ args << "-";
+
+ return args;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+OutFormat_Flac::OutFormat_Flac()
+{
+ mId = "FLAC";
+ mExt = "flac";
+ mName = "Flac";
+}
+
+
+
+/************************************************
+
+ ************************************************/
+bool OutFormat_Flac::check(QStringList *errors) const
+{
+ bool res = OutFormat::check(errors);
+
+ if (gainType() != OutFormat::GainDisable)
+ {
+ for (int i=0; i<project->count(); ++i)
+ {
+ if (project->disk(i)->audioFile()->sampleRate() > 48000)
+ {
+ *errors << QObject::tr("you can't use 'ReplayGain' for files with sample rates above 48kHz. Metaflac doesn't support such files.",
+ "This string should begin with a lowercase letter. This is a part of the complex sentence.");
+ res = false;
+ break;
+ }
+ }
+ }
+
+ return res;
+}
+
+
+/************************************************
+
+ ************************************************/
+QStringList OutFormat_Flac::encoderArgs(Track *track, const QString &outFile) const
+{
+ QStringList args;
+
+ args << settings->programName(encoderProgramName());
+ args << "--force"; // Force overwriting of output files.
+ args << "--silent"; // Suppress progress indicator
+
+ // Settings .................................................
+ args << QString("--compression-level-%1").arg(settings->value("Flac/Compression").toString());
+
+
+ // Tags .....................................................
+ if (!track->artist().isEmpty()) args << "--tag" << QString("artist=%1").arg(track->artist());
+ if (!track->album().isEmpty()) args << "--tag" << QString("album=%1").arg(track->album());
+ if (!track->genre().isEmpty()) args << "--tag" << QString("genre=%1").arg(track->genre());
+ if (!track->date().isEmpty()) args << "--tag" << QString("date=%1").arg(track->date());
+ if (!track->title().isEmpty()) args << "--tag" << QString("title=%1").arg(track->title());
+ if (!track->comment().isEmpty()) args << "--tag" << QString("comment=%1").arg(track->comment());
+ if (!track->disk()->discId().isEmpty()) args << "--tag" << QString("discId=%1").arg(track->disk()->discId());
+ args << "--tag" << QString("TRACKNUMBER=%1").arg(track->trackNum());
+ args << "--tag" << QString("TOTALTRACKS=%1").arg(track->disk()->count());
+ args << "--tag" << QString("TRACKTOTAL=%1").arg(track->disk()->count());
+
+
+ args << "-";
+ args << "-o" << outFile;
+ return args;
+}
+
+
+/************************************************
+
+ ************************************************/
+QStringList OutFormat_Flac::gainArgs(const QStringList &files) const
+{
+ QStringList args;
+ args << settings->programName(gainProgramName());
+ args << "--add-replay-gain";
+ args << files;
+
+ return args;
+}
+
+
+/************************************************
+
+ ************************************************/
+QHash<QString, QVariant> OutFormat_Flac::defaultParameters() const
+{
+ QHash<QString, QVariant> res;
+ res.insert("Flac/Compression", 5);
+ res.insert("Flac/ReplayGain", gainTypeToString(GainDisable));
+ return res;
+}
+
+
+/************************************************
+
+ ************************************************/
+EncoderConfigPage *OutFormat_Flac::configPage(QWidget *parent) const
+{
+ return new ConfigPage_Flac(parent);
+}
+
+
+/************************************************
+
+ ************************************************/
+ConfigPage_Flac::ConfigPage_Flac(QWidget *parent):
+ EncoderConfigPage(parent)
+{
+ setupUi(this);
+
+ setLosslessToolTip(flacCompressionSlider);
+ flacCompressionSpin->setToolTip(flacCompressionSlider->toolTip());
+ fillReplayGainComboBox(flacGainCbx);
+}
+
+
+/************************************************
+
+ ************************************************/
+void ConfigPage_Flac::load()
+{
+ loadWidget("Flac/Compression", flacCompressionSlider);
+ loadWidget("Flac/ReplayGain", flacGainCbx);
+}
+
+
+/************************************************
+
+ ************************************************/
+void ConfigPage_Flac::write()
+{
+ writeWidget("Flac/Compression", flacCompressionSlider);
+ writeWidget("Flac/ReplayGain", flacGainCbx);
+}
+
+
+
+
+

flacon-3.1.1.tar.gz/formats/flac.h Added

@@ -0,0 +1,78 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2012-2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef FLAC_H
+#define FLAC_H
+
+#include "outformat.h"
+#include "format.h"
+#include "configdialog.h"
+#include "ui_flac_config.h"
+
+class OutFormat_Flac: public OutFormat
+{
+public:
+ OutFormat_Flac();
+ bool check(QStringList *errors) const;
+
+ virtual QString encoderProgramName() const { return "flac"; }
+ virtual QString gainProgramName() const { return "metaflac"; }
+
+ virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
+ virtual QStringList gainArgs(const QStringList &files) const;
+
+ QHash<QString, QVariant> defaultParameters() const;
+ EncoderConfigPage *configPage(QWidget *parent = 0) const;
+};
+
+class Format_Flac: public AudioFormat
+{
+public:
+ virtual QString name() const { return "FLAC"; }
+ virtual QString ext() const { return "flac"; }
+ virtual bool isInputFormat() const { return true; }
+
+ virtual QString decoderProgramName() const { return "flac"; }
+ virtual QStringList decoderArgs(const QString &fileName) const;
+
+ virtual QByteArray magic() const { return "fLaC"; }
+ virtual uint const magicOffset() const { return 0; }
+};
+
+
+class ConfigPage_Flac: public EncoderConfigPage, private Ui::ConfigPage_Flac
+{
+ Q_OBJECT
+public:
+ explicit ConfigPage_Flac(QWidget *parent = 0);
+
+ virtual void load();
+ virtual void write();
+
+};
+
+
+#endif // FLAC_H

flacon-3.1.1.tar.gz/formats/flac_config.ui Changed

flacon-3.1.1.tar.gz/formats/format.cpp Added

@@ -0,0 +1,172 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "format.h"
+
+#include "flac.h"
+#include <QDebug>
+#include <QIODevice>
+#include <QByteArray>
+#include <QFile>
+
+AudioFormatList AudioFormat::mAllFormats;
+
+
+/************************************************
+ *
+ ************************************************/
+bool AudioFormat::registerFormat(const AudioFormat &f)
+{
+ // Some formats can be embedded as a chunk of RIFF stream.
+ // So the WAV format should be last and be checked in the last turn.
+ if (f.ext() == "wav")
+ mAllFormats.append(&f);
+ else
+ mAllFormats.insert(0, &f);
+ return true;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+AudioFormat::AudioFormat()
+{
+}
+
+
+/************************************************
+ *
+ ************************************************/
+AudioFormat::~AudioFormat()
+{
+}
+
+
+/************************************************
+ *
+ ************************************************/
+const AudioFormatList &AudioFormat::allFormats()
+{
+ return mAllFormats;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+const AudioFormatList &AudioFormat::inputFormats()
+{
+ static AudioFormatList res;
+ if (res.isEmpty())
+ {
+ foreach (const AudioFormat* f, allFormats())
+ {
+ if (f->isInputFormat())
+ res << f;
+ }
+ }
+
+ return res;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+const AudioFormatList &AudioFormat::outFormats()
+{
+ static AudioFormatList res;
+ if (res.isEmpty())
+ {
+ foreach (const AudioFormat* f, allFormats())
+ {
+ if (f->isOutputFormat())
+ res << f;
+ }
+ }
+
+ return res;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool AudioFormat::checkMagic(const QByteArray &data) const
+{
+ return data.mid(magicOffset(), magic().length()) == magic();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QString AudioFormat::filterDecoderStderr(const QString &stdErr) const
+{
+ return stdErr;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+const AudioFormat *AudioFormat::formatForFile(QIODevice *device)
+{
+ int bufSize = 0;
+ foreach (const AudioFormat *format, allFormats())
+ bufSize = qMax(bufSize, int(format->magicOffset() + format->magic().length()));
+
+ QByteArray buf = device->read(bufSize);
+ if (buf.size() < bufSize)
+ return NULL;
+
+ foreach (const AudioFormat *format, allFormats())
+ {
+ if (format->checkMagic(buf))
+ return format;
+ }
+
+ return NULL;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+const AudioFormat *AudioFormat::formatForFile(const QString &fileName)
+{
+ QFile file(fileName);
+ if (! file.open(QFile::ReadOnly))
+ {
+ return NULL;
+ }
+
+ const AudioFormat *res = formatForFile(&file);
+ file.close();
+ return res;
+}
+

flacon-3.1.1.tar.gz/formats/format.h Added

@@ -0,0 +1,84 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef FORMAT_H
+#define FORMAT_H
+
+#include <QList>
+#include <QStringList>
+#include <QByteArray>
+class QIODevice;
+
+class AudioFormat;
+typedef QList<const AudioFormat*> AudioFormatList;
+
+class AudioFormat
+{
+public:
+ AudioFormat();
+ virtual ~AudioFormat();
+
+ virtual QString name() const = 0;
+ virtual QString ext() const = 0;
+
+ virtual bool isInputFormat() const { return false; }
+
+ virtual QString decoderProgramName() const { return ""; }
+ virtual QStringList decoderArgs(const QString &fileName) const { return QStringList(); }
+ virtual QByteArray magic() const = 0;
+ virtual uint const magicOffset() const { return 0; }
+
+
+ // Out format
+ virtual bool isOutputFormat() const { return false; }
+
+ static const AudioFormatList &allFormats();
+ static const AudioFormatList &inputFormats();
+ static const AudioFormatList &outFormats();
+
+ static const AudioFormat *formatForFile(QIODevice *device);
+ static const AudioFormat *formatForFile(const QString &fileName);
+
+ static bool registerFormat(const AudioFormat &f);
+
+ virtual QString filterDecoderStderr(const QString &stdErr) const;
+
+
+protected:
+ virtual bool checkMagic(const QByteArray &data) const;
+
+private:
+ static QList<const AudioFormat*> mAllFormats;
+};
+
+
+
+
+#define REGISTER_FORMAT(FORMAT) \
+ static FORMAT static_##FORMAT##_Instance; \
+ static bool is_##FORMAT##_loaded = AudioFormat::registerFormat(static_##FORMAT##_Instance);
+
+#endif // FORMAT_H

flacon-3.1.1.tar.gz/formats/mp3.cpp Changed

flacon-3.1.1.tar.gz/formats/mp3.h Changed

flacon-3.1.1.tar.gz/formats/mp3_config.ui Changed

flacon-3.1.1.tar.gz/formats/ogg.cpp Changed

flacon-3.1.1.tar.gz/formats/ogg.h Changed

flacon-3.1.1.tar.gz/formats/ogg_config.ui Changed

flacon-3.1.1.tar.gz/formats/opus.cpp Changed

flacon-3.1.1.tar.gz/formats/opus.h Changed

flacon-3.1.1.tar.gz/formats/opus_config.ui Changed

flacon-3.1.1.tar.gz/formats/outformat.cpp Changed

flacon-3.1.1.tar.gz/formats/outformat.h Changed

flacon-3.1.1.tar.gz/formats/tta.cpp Added

@@ -0,0 +1,58 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "tta.h"
+#include <QDebug>
+
+REGISTER_FORMAT(Format_Tta)
+
+
+/************************************************
+ *
+ ************************************************/
+QStringList Format_Tta::decoderArgs(const QString &fileName) const
+{
+ QStringList args;
+ args << fileName;
+ args << "-";
+ args << "-d";
+
+ return args;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QString Format_Tta::filterDecoderStderr(const QString &stdErr) const
+{
+
+ int pos = stdErr.indexOf("Error:");
+ if (pos>-1)
+ return stdErr.mid(pos + 6).trimmed();
+
+ return "";
+}

flacon-3.1.1.tar.gz/formats/tta.h Added

@@ -0,0 +1,51 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef TTA_H
+#define TTA_H
+
+#include "format.h"
+
+class Format_Tta: public AudioFormat
+{
+public:
+ virtual QString name() const { return "TTA"; }
+ virtual QString ext() const { return "tta"; }
+ virtual QByteArray magic() const { return "TTA1"; }
+ virtual uint const magicOffset() const { return 0; }
+
+
+ virtual bool isInputFormat() const { return true; }
+ virtual QString decoderProgramName() const { return "ttaenc"; }
+ virtual QStringList decoderArgs(const QString &fileName) const;
+ virtual QString filterDecoderStderr(const QString &stdErr) const;
+
+ virtual bool isOutputFormat() const { return false; }
+
+
+};
+
+#endif // TTA_H

flacon-3.1.1.tar.gz/formats/wav.cpp Added

@@ -0,0 +1,151 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2012-2013
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "wav.h"
+#include <QFile>
+
+REGISTER_FORMAT(Format_Wav)
+
+/************************************************
+ *
+ ************************************************/
+QStringList Format_Wav::decoderArgs(const QString &fileName) const
+{
+ return QStringList();
+}
+
+
+/************************************************
+
+ ************************************************/
+OutFormat_Wav::OutFormat_Wav()
+{
+ mId = "WAV";
+ mExt = "wav";
+ mName = "WAV";
+}
+
+
+/************************************************
+
+ ************************************************/
+QStringList OutFormat_Wav::encoderArgs(Track *track, const QString &outFile) const
+{
+ return QStringList();
+}
+
+
+/************************************************
+
+ ************************************************/
+QStringList OutFormat_Wav::gainArgs(const QStringList &files) const
+{
+ return QStringList();
+}
+
+
+/************************************************
+
+ ************************************************/
+Encoder *OutFormat_Wav::createEncoder(Track *track, QObject *parent) const
+{
+ return new Encoder_Wav(this, track, parent);
+}
+
+
+/************************************************
+
+ ************************************************/
+Gain *OutFormat_Wav::createGain(Disk *disk, Track *track, QObject *parent) const
+{
+ return 0;
+}
+
+
+/************************************************
+
+ ************************************************/
+QHash<QString, QVariant> OutFormat_Wav::defaultParameters() const
+{
+ QHash<QString, QVariant> res;
+ return res;
+}
+
+
+/************************************************
+
+ ************************************************/
+EncoderConfigPage *OutFormat_Wav::configPage(QWidget *parent) const
+{
+ return 0;
+}
+
+
+/************************************************
+
+ ************************************************/
+Encoder_Wav::Encoder_Wav(const OutFormat *format, Track *track, QObject *parent):
+ Encoder(format, track, parent)
+{
+}
+
+
+/************************************************
+
+ ************************************************/
+void Encoder_Wav::doRun()
+{
+ QFile srcFile(inputFile());
+ QFile destFile(outFile());
+
+ bool res = (!destFile.exists() || destFile.remove());
+
+ if (res)
+ res = srcFile.rename(outFile());
+
+ if (!res)
+ {
+ error(track(),
+ tr("I can't rename file:\n%1 to %2\n%3").arg(
+ inputFile(),
+ outFile(),
+ srcFile.errorString()));
+ }
+}
+
+
+/************************************************
+
+ ************************************************/
+QStringList Encoder_Wav::processArgs() const
+{
+ return QStringList();
+}
+
+
+
+
+

flacon-3.1.1.tar.gz/formats/wav.h Added

@@ -0,0 +1,81 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2012-2013
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef WAV_H
+#define WAV_H
+
+#include "outformat.h"
+#include "format.h"
+#include "encoder.h"
+
+class OutFormat_Wav: public OutFormat
+{
+public:
+ OutFormat_Wav();
+
+ virtual QString encoderProgramName() const { return ""; }
+ virtual QString gainProgramName() const { return ""; }
+
+ virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
+ virtual QStringList gainArgs(const QStringList &files) const;
+
+
+ QHash<QString, QVariant> defaultParameters() const;
+ EncoderConfigPage *configPage(QWidget *parent = 0) const;
+
+ virtual bool hasConfigPage() const { return false; }
+
+ virtual Encoder *createEncoder(Track *track, QObject *parent = 0) const;
+ virtual Gain *createGain(Disk *disk, Track *track, QObject *parent = 0) const;
+};
+
+
+class Encoder_Wav: public Encoder
+{
+ Q_OBJECT
+public:
+ explicit Encoder_Wav(const OutFormat *format, Track *track, QObject *parent = 0);
+
+protected:
+ void doRun();
+ virtual QStringList processArgs() const;
+};
+
+class Format_Wav: public AudioFormat
+{
+public:
+ virtual QString name() const { return "WAV"; }
+ virtual QString ext() const { return "wav"; }
+ virtual bool isInputFormat() const { return true; }
+
+ virtual QString decoderProgramName() const { return ""; }
+ virtual QStringList decoderArgs(const QString &fileName) const;
+
+ virtual QByteArray magic() const { return "RIFF"; }
+ virtual uint const magicOffset() const { return 0; }
+};
+
+#endif // WAV_H

flacon-3.1.1.tar.gz/formats/wv.cpp Added

@@ -0,0 +1,169 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2012-2013
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "wv.h"
+#include "settings.h"
+#include <QDebug>
+
+REGISTER_FORMAT(Format_Wv)
+
+/************************************************
+ * As I understand WavPack can be embedded as a chunk of a RIFF stream.
+ * I have not such a file, if anyone has one, please send me.
+ ************************************************/
+bool Format_Wv::checkMagic(const QByteArray &data) const
+{
+ return data.contains(magic());
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QStringList Format_Wv::decoderArgs(const QString &fileName) const
+{
+ QStringList args;
+ args << "-q";
+ args << "-y";
+ args << fileName;
+ args << "-o" << "-";
+
+ return args;
+}
+
+
+/************************************************
+
+ ************************************************/
+OutFormat_Wv::OutFormat_Wv()
+{
+ mId = "WV";
+ mExt = "wv";
+ mName = "WavPack";
+}
+
+
+/************************************************
+
+ ************************************************/
+QStringList OutFormat_Wv::encoderArgs(Track *track, const QString &outFile) const
+{
+ QStringList args;
+
+ args << settings->programName(encoderProgramName());
+
+ args << "-q"; // Suppress progress indicator
+
+ // Settings .................................................
+ int compression = settings->value("WV/Compression").toInt();
+ if (compression == 0) args << "-f";
+ if (compression == 1) args << "-h";
+ if (compression == 2) args << "-hh";
+
+ // Tags .....................................................
+ if (!track->artist().isEmpty()) args << "-w" << QString("Artist=%1").arg(track->artist());
+ if (!track->album().isEmpty()) args << "-w" << QString("Album=%1").arg(track->album());
+ if (!track->genre().isEmpty()) args << "-w" << QString("Genre=%1").arg(track->genre());
+ if (!track->date().isEmpty()) args << "-w" << QString("Year=%1").arg(track->date());
+ if (!track->title().isEmpty()) args << "-w" << QString("Title=%1").arg(track->title());
+ if (!track->disk()->discId().isEmpty()) args << "-w" << QString("DiscId=%1").arg(track->disk()->discId());
+ if (!track->comment().isEmpty()) args << "-w" << QString("Comment=%1").arg(track->comment());
+ args << "-w" << QString("Track=%1/%2").arg(track->trackNum()).arg(track->disk()->count());
+
+ args << "-";
+ args << "-o" << outFile;
+
+ return args;
+}
+
+
+/************************************************
+
+ ************************************************/
+QStringList OutFormat_Wv::gainArgs(const QStringList &files) const
+{
+ QStringList args;
+ args << args << settings->programName(gainProgramName());
+ args << "-a";
+ args << files;
+
+ return args;
+}
+
+
+/************************************************
+
+ ************************************************/
+QHash<QString, QVariant> OutFormat_Wv::defaultParameters() const
+{
+ QHash<QString, QVariant> res;
+ res.insert("WV/Compression", 1);
+ res.insert("WV/ReplayGain", gainTypeToString(GainDisable));
+ return res;
+}
+
+
+/************************************************
+
+ ************************************************/
+EncoderConfigPage *OutFormat_Wv::configPage(QWidget *parent) const
+{
+ return new ConfigPage_Wv(parent);
+}
+
+
+/************************************************
+
+ ************************************************/
+ConfigPage_Wv::ConfigPage_Wv(QWidget *parent):
+ EncoderConfigPage(parent)
+{
+ setupUi(this);
+
+ setLosslessToolTip(wvCompressionSlider);
+ wvCompressionSpin->setToolTip(wvCompressionSlider->toolTip());
+ fillReplayGainComboBox(wvGainCbx);
+}
+
+
+/************************************************
+
+ ************************************************/
+void ConfigPage_Wv::load()
+{
+ loadWidget("WV/Compression", wvCompressionSlider);
+ loadWidget("WV/ReplayGain", wvGainCbx);
+}
+
+
+/************************************************
+
+ ************************************************/
+void ConfigPage_Wv::write()
+{
+ writeWidget("WV/Compression", wvCompressionSlider);
+ writeWidget("WV/ReplayGain", wvGainCbx);
+}

flacon-3.1.1.tar.gz/formats/wv.h Added

@@ -0,0 +1,81 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2012-2013
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef WV_H
+#define WV_H
+
+#include "format.h"
+#include "outformat.h"
+#include "configdialog.h"
+#include "ui_wv_config.h"
+
+class OutFormat_Wv: public OutFormat
+{
+public:
+ OutFormat_Wv();
+
+ virtual QString encoderProgramName() const { return "wavpack"; }
+ virtual QString gainProgramName() const { return "wvgain"; }
+
+ virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
+ virtual QStringList gainArgs(const QStringList &files) const;
+
+ QHash<QString, QVariant> defaultParameters() const;
+ EncoderConfigPage *configPage(QWidget *parent = 0) const;
+
+};
+
+class Format_Wv: public AudioFormat
+{
+public:
+ virtual QString name() const { return "WavPack"; }
+ virtual QString ext() const { return "wv"; }
+ virtual QByteArray magic() const { return "wvpk"; }
+ virtual uint const magicOffset() const { return 0; }
+
+
+ virtual bool isInputFormat() const { return true; }
+ virtual QString decoderProgramName() const { return "wvunpack"; }
+ virtual QStringList decoderArgs(const QString &fileName) const;
+
+ virtual bool isOutputFormat() const { return false; }
+
+protected:
+ virtual bool checkMagic(const QByteArray &data) const;
+
+};
+
+class ConfigPage_Wv: public EncoderConfigPage, private Ui::ConfigPage_Wv
+{
+ Q_OBJECT
+public:
+ explicit ConfigPage_Wv(QWidget *parent = 0);
+
+ virtual void load();
+ virtual void write();
+};
+
+#endif // WV_H

flacon-3.1.1.tar.gz/formats/wv_config.ui Changed

flacon-2.1.1.tar.gz/gui/aboutdialog/aboutdialog.cpp -> flacon-3.1.1.tar.gz/gui/aboutdialog/aboutdialog.cpp Changed

flacon-2.1.1.tar.gz/gui/controls.cpp -> flacon-3.1.1.tar.gz/gui/controls.cpp Changed

flacon-2.1.1.tar.gz/gui/mainwindow.cpp -> flacon-3.1.1.tar.gz/gui/mainwindow.cpp Changed

flacon-2.1.1.tar.gz/gui/trackview.cpp -> flacon-3.1.1.tar.gz/gui/trackview.cpp Changed

@@ -75,8 +75,7 @@
 QModelIndexList idxs = selectionModel()->selectedIndexes();
 foreach(QModelIndex index, idxs)
 {
- QObject *obj = static_cast<QObject*>(index.internalPointer());
- Track *track = qobject_cast<Track*>(obj);
+ Track *track = mModel->trackByIndex(index);
 if (track)
 res << track;
 }
@@ -94,12 +93,7 @@
 QModelIndexList idxs = selectionModel()->selectedIndexes();
 foreach(QModelIndex index, idxs)
 {
- QObject *obj = static_cast<QObject*>(index.internalPointer());
- Track *track = qobject_cast<Track*>(obj);
- if (track)
- set << track->disk();
-
- Disk *disk = qobject_cast<Disk*>(obj);
+ Disk *disk = mModel->diskByIndex(index);
 if (disk)
 set << disk;
 }
@@ -134,9 +128,8 @@
 for (int i=0; i<this->model()->rowCount(); ++i)
 {
 QModelIndex index = this->model()->index(i, 0);
- QObject *obj = static_cast<QObject*>(index.internalPointer());
 
- Disk *d = qobject_cast<Disk*>(obj);
+ Disk *d = mModel->diskByIndex(index);
 if (d && d == disk)
 {
 this->selectionModel()->select(index, QItemSelectionModel::Clear | QItemSelectionModel::Select);
@@ -184,8 +177,7 @@
 ************************************************/
 void TrackView::showTrackMenu(const QModelIndex &index, const QRect &buttonRect)
 {
- QObject *obj = static_cast<QObject*>(index.internalPointer());
- Disk *disk = qobject_cast<Disk*>(obj);
+ Disk *disk = mModel->diskByIndex(index);
 if(!disk)
 return;

flacon-2.1.1.tar.gz/gui/trackviewdelegate.cpp -> flacon-3.1.1.tar.gz/gui/trackviewdelegate.cpp Changed

@@ -27,7 +27,6 @@
 #include "trackviewdelegate.h"
 #include "trackview.h"
 #include "trackviewmodel.h"
-#include "disk.h"
 #include "project.h"
 #include "internet/dataprovider.h"
 
@@ -167,7 +166,7 @@
 ************************************************/
 void TrackViewDelegate::drawBranch(QPainter *painter, const QRect &rect, const QModelIndex &index) const
 {
- QColor bgColor = (index.row() % 2) ? mTrackView->palette().base().color() : mTrackView->palette().alternateBase().color();
+ QColor bgColor = mTrackView->palette().base().color();
 if (rect.isValid())
 painter->fillRect(rect, bgColor);
 
@@ -184,35 +183,41 @@
 QStyleOptionViewItem opt = option;
 opt.state &= ~QStyle::State_Selected;
 
- QObject *obj = static_cast<QObject*>(index.internalPointer());
- Track *track = qobject_cast<Track*>(obj);
- if (track)
- {
- QColor bgColor = (index.row() % 2) ? mTrackView->palette().base().color() : mTrackView->palette().alternateBase().color();
- painter->fillRect(opt.rect, bgColor);
+ TrackViewModel::ItemType type = TrackViewModel::ItemType(index.data(TrackViewModel::RoleItemType).toInt());
 
- paintTrack(painter, opt, index, track);
+ if (type == TrackViewModel::TrackItem)
+ {
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+ if (index.row() % 2)
+ painter->fillRect(option.rect, mTrackView->palette().base().color());
+ else
+ painter->fillRect(option.rect, mTrackView->palette().alternateBase().color());
+#else
+ if (index.row() % 2)
+ opt.features &= ~QStyleOptionViewItemV2::Alternate;
+ else
+ opt.features |= QStyleOptionViewItemV2::Alternate;
+#endif
+ paintTrack(painter, opt, index);
 return;
 }
 
- if (index.column() == 0)
+
+ if (type == TrackViewModel::DiskItem && index.column() == 0)
 {
- Disk *disk = qobject_cast<Disk*>(obj);
- if (disk)
+ QColor bgColor = mTrackView->palette().base().color();
+ painter->fillRect(opt.rect, bgColor);
+
+ if (mTrackView-> selectionModel()->isSelected(index))
 {
- QColor bgColor = mTrackView->palette().base().color();
- painter->fillRect(opt.rect, bgColor);
-
- if (mTrackView-> selectionModel()->isSelected(index))
- {
- QRect rect = opt.rect;
- if (index.row() > 0)
- rect.setTop(rect.top() + TOP_PADDING);
- drawSelectionMark(painter, rect);
- }
-
- paintDisk(painter, opt, index, disk);
+ QRect rect = opt.rect;
+ if (index.row() > 0)
+ rect.setTop(rect.top() + TOP_PADDING);
+ drawSelectionMark(painter, rect);
 }
+
+ paintDisk(painter, opt, index);
+ return;
 }
 }
 
@@ -220,7 +225,7 @@
 /************************************************
 
 ************************************************/
-void TrackViewDelegate::paintTrack(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, const Track *track) const
+void TrackViewDelegate::paintTrack(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
 QStyledItemDelegate::paint(painter, option, index);
 
@@ -229,9 +234,9 @@
 
 const QPixmap *icon = 0;
 QString txt;
- int progress = track->progress();
+ int progress = index.data(TrackViewModel::RolePercent).toInt();
 
- switch (track->status())
+ switch (index.data(TrackViewModel::RoleStatus).toInt())
 {
 case Track::NotRunning: txt = ""; progress = -1; break;
 case Track::Canceled: txt = ""; break;
@@ -248,7 +253,6 @@
 }
 
 
-
 painter->save();
 painter->translate(option.rect.left() + 30, option.rect.top());
 QRect windowRect(0, 0, option.rect.width() - 31, option.rect.height());
@@ -290,7 +294,7 @@
 /************************************************
 
 ************************************************/
-void TrackViewDelegate::paintDisk(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, const Disk *disk) const
+void TrackViewDelegate::paintDisk(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
 QRect paintRect = option.rect;
 paintRect.setLeft(0);
@@ -350,8 +354,8 @@
 QRect tFileRect(l, tTop, windowRect.width(), th);
 QRect aFileRect(l, aTop, windowRect.width(), th);
 
- tFileRect = drawFile(disk->tagsTitle(), tFileRect, painter);
- QFileInfo fi(disk->audioFileName());
+ tFileRect = drawFile(index.data(TrackViewModel::RoleTitle).toString(), tFileRect, painter);
+ QFileInfo fi(index.data(TrackViewModel::RoleAudioFileName).toString());
 aFileRect = drawFile(fi.fileName(), aFileRect, painter);
 
 
@@ -380,14 +384,14 @@
 // Draw bottom line ................................
 painter->setPen(mTrackView->palette().dark().color());
 int y = option.rect.height() - BOTTOM_PADDING - 2;
- painter->drawLine(MARGIN, y, windowRect.right(), y);
+ painter->drawLine(MARGIN * 2, y, windowRect.right(), y);
 
 // Draw warning mark ...............................
 QRect markRect(imgRect.right() - MARK_HEIGHT, imgRect.bottom() - MARK_HEIGHT, MARK_HEIGHT, MARK_HEIGHT);
- if (!disk->canConvert())
+ if (!index.data(TrackViewModel::RoleCanConvert).toBool())
 painter->drawPixmap(markRect, mWarnPix);
 
- cache->isWaiting = disk->isDownloads();
+ cache->isWaiting = index.data(TrackViewModel::RoleIsDownloads).toBool();
 if (cache->isWaiting)
 {
 painter->drawPixmap(markRect, mDownloadMovie.currentPixmap());

flacon-2.1.1.tar.gz/gui/trackviewdelegate.h -> flacon-3.1.1.tar.gz/gui/trackviewdelegate.h Changed

flacon-2.1.1.tar.gz/gui/trackviewmodel.cpp -> flacon-3.1.1.tar.gz/gui/trackviewmodel.cpp Changed

@@ -33,6 +33,70 @@
 #include <QDebug>
 #include <QSet>
 
+class IndexData
+{
+public:
+ explicit IndexData(const QModelIndex &index)
+ {
+ mDiskId = (quint32(index.internalId()) & 0xFFFFFF);
+ mTrackId = (quint32(index.internalId()) >> 16);
+ }
+
+ explicit IndexData(quint16 diskNum, quint16 trackNum)
+ {
+ mDiskId = diskNum + 1;
+ mTrackId = trackNum + 1;
+ }
+
+ explicit IndexData(quint16 diskNum)
+ {
+ mDiskId = diskNum + 1;
+ mTrackId = 0;
+ }
+
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+ quint32 asPtr()
+ {
+ return quint32((mTrackId << 16) | mDiskId);
+ }
+#else
+ quintptr asPtr()
+ {
+ return quintptr((mTrackId << 16) | mDiskId);
+ }
+#endif
+
+
+ bool isDisk() const { return mDiskId > 0; }
+ bool isTrack() const { return mTrackId > 0; }
+
+ int diskNum() const { return mDiskId - 1; }
+ int trackNum() const { return mTrackId - 1; }
+
+ Disk *disk() const
+ {
+ if (mDiskId && mDiskId-1 < project->count())
+ return project->disk(mDiskId - 1);
+
+ return NULL;
+ }
+
+ Track *track() const
+ {
+ if (mTrackId)
+ {
+ Disk *disk = this->disk();
+ if (disk && mTrackId -1 < disk->count())
+ return disk->track(mTrackId - 1);
+ }
+ return NULL;
+ }
+
+private:
+ quint16 mDiskId;
+ quint16 mTrackId;
+};
+
 
 /************************************************
 
@@ -44,13 +108,9 @@
 connect(project, SIGNAL(diskChanged(Disk*)), this, SLOT(diskDataChanged(Disk*)));
 connect(project, SIGNAL(trackChanged(int,int)), this, SLOT(trackDataChanged(int,int)));
 connect(project, SIGNAL(layoutChanged()), this, SIGNAL(layoutChanged()));
- connect(project, SIGNAL(beforeRemoveDisk(Disk*)), this, SLOT(beforeRemoveDisk(Disk*)));
- connect(project, SIGNAL(afterRemoveDisk()), this, SLOT(afterRemoveDisk()));
+ connect(project, SIGNAL(afterRemoveDisk()), this, SIGNAL(layoutChanged()));
 
 connect(project, SIGNAL(trackProgress(const Track*)), this, SLOT(trackProgressChanged(const Track*)));
-
- //connect(project, SIGNAL("downloadStarted(int)"), self._downloadStarted)
- //self.connect(project, SIGNAL("downloadFinished(int)"), self._downloadFinished)
 }
 
 
@@ -76,8 +136,6 @@
 }
 
 
-
-
 /************************************************
 
 ************************************************/
@@ -87,18 +145,13 @@
 return QModelIndex();
 
 
- if (parent.internalPointer() == project)
- return createIndex(row, column, project->disk(row));
-
- QObject *obj = static_cast<QObject*>(parent.internalPointer());
- Disk *disk = qobject_cast<Disk*>(obj);
- if(disk)
- return createIndex(row, column, disk->track(row));
- else
- return createIndex(row, column, project->disk(row));
+ if (IndexData(parent).isTrack())
+ return QModelIndex();
 
+ if (IndexData(parent).isDisk())
+ return createIndex(row, column, IndexData(parent.row(), row).asPtr());
 
- return QModelIndex();
+ return createIndex(row, column, IndexData(row).asPtr());
 }
 
 
@@ -140,13 +193,9 @@
 if (!child.isValid())
 return QModelIndex();
 
- QObject *obj = static_cast<QObject*>(child.internalPointer());
- Track *track = qobject_cast<Track*>(obj);
- if (track)
- {
- int row = project->indexOf(track->disk());
- return index(row, 0, QModelIndex());
- }
+ IndexData data(child);
+ if (data.isTrack())
+ return index(data.diskNum(), 0, QModelIndex());
 
 return QModelIndex();
 }
@@ -160,11 +209,13 @@
 if (!index.isValid())
 return QVariant();
 
- Track *track = trackByIndex(index);
+ IndexData indexData(index);
+
+ Track *track = indexData.track();
 if (track)
 return trackData(track, index, role);
 
- Disk *disk = diskByIndex(index);
+ Disk *disk = indexData.disk();
 if(disk)
 return diskData(disk, index, role);
 
@@ -271,17 +322,21 @@
 return QVariant();
 
 }
- // StatusPercent ::::::::::::::::::::::::::::::::::::
-// if (role == StatusPercentRole)
-// {
-// // return track.progress()
-// }
-
-// // Status :::::::::::::::::::::::::::::::::::::::::::
-// if (role == StatusRole)
-// {
-// // return track.status();
-// }
+
+ switch (role)
+ {
+ case RoleItemType: return TrackItem;
+ case RolePercent: return track->progress();
+ case RoleStatus: return track->status();
+ case RoleTracknum: return track->trackNum();
+ case RoleDuration: return track->duration();
+ case RoleTitle: return track->title();
+ case RoleArtist: return track->artist();
+ case RoleAlbum: return track->album();
+ case RoleComment: return track->album();
+ case RoleFileName: return track->resultFileName();
+ default: return QVariant();
+ }
 
 return QVariant();
 }
@@ -341,24 +396,17 @@
 
 }
 
-//# StatusPercent ::::::::::::::::::::::::::::::::::::
-//elif (role == self.StatusPercentRole):
-// try:
-// return QVariant(self._downloadsStates[index.row()])
-// except KeyError:
-// return QVariant()
-
-//# Download pixmap ::::::::::::::::::::::::::::::::::
-//elif role == self.DownloadPxmapRole:
-// try:
-// self._downloadsStates[index.row()]

flacon-2.1.1.tar.gz/gui/trackviewmodel.h -> flacon-3.1.1.tar.gz/gui/trackviewmodel.h Changed

@@ -38,14 +38,14 @@
 
 class TrackViewModel : public QAbstractItemModel
 {
+    friend class TrackView;
+    friend class TrackViewDelegate;
     Q_OBJECT
 public:
     explicit TrackViewModel(TrackView *parent = 0);
     
     QVariant headerData(int section, Qt::Orientation orientation, int role) const;
     QModelIndex index(int row, int column, const QModelIndex &parent) const;
-    QModelIndex index(const Disk *disk, int col = 0) const;
-    QModelIndex index(const Track *track, int col = 0) const;
     QModelIndex parent(const QModelIndex &child) const;
 
     QVariant data(const QModelIndex &index, int role) const;
@@ -57,25 +57,47 @@
 
     TrackView *view() const { return mView; }
 
-    static Disk *diskByIndex(const QModelIndex &index);
-    static Track *trackByIndex(const QModelIndex &index);
-
-
 
 public slots:
 
+protected:
+    enum ItemType {
+        TrackItem = 1,
+        DiskItem = 2
+    };
+
+    enum Roles{
+        RoleItemType   = Qt::UserRole + 1,
+        RolePercent,
+        RoleStatus,
+        RoleTracknum,
+        RoleDuration,
+        RoleTitle,
+        RoleArtist,
+        RoleAlbum,
+        RoleComment,
+        RoleFileName,
+        RoleAudioFileName,
+        RoleCanConvert,
+        RoleIsDownloads,
+        RoleItemID,
+        RoleTrack
+    };
+
+    Disk *diskByIndex(const QModelIndex &index);
+    Track *trackByIndex(const QModelIndex &index);
 
 private slots:
     void diskDataChanged(Disk *disk);
     void trackDataChanged(int disk, int track);
-    void beforeRemoveDisk(Disk *disk);
-    void afterRemoveDisk();
     void trackProgressChanged(const Track *track);
 
 private:
     QVariant trackData(const Track *track, const QModelIndex &index, int role) const;
     QVariant diskData(const Disk *disk, const QModelIndex &index, int role) const;
     QString trackDurationToString(uint milliseconds) const;
+    QModelIndex index(const Disk *disk, int col = 0) const;
+    QModelIndex index(const Track *track, int col = 0) const;
 
     TrackView *mView;
 };

flacon-2.1.1.tar.gz/inputaudiofile.cpp -> flacon-3.1.1.tar.gz/inputaudiofile.cpp Changed

@@ -25,6 +25,8 @@
 
 
 #include "inputaudiofile.h"
+#include "decoder.h"
+#include "format.h"
 #include <settings.h>
 #include <QProcess>
 #include <QStringList>
@@ -34,37 +36,37 @@
 #include <QFileInfo>
 #include <QDir>
 
-void initInputAudioFormat(QList<InputAudioFormat> *formats)
-{
- *formats << InputAudioFormat("APE", "ape", "mac");
- *formats << InputAudioFormat("FLAC", "flac", "flac");
- *formats << InputAudioFormat("WavPack", "wv", "wvunpack");
- *formats << InputAudioFormat("TTA", "tta", "ttaenc");
- *formats << InputAudioFormat("WAV", "wav", "");
-}
+//void initInputAudioFormat(QList<InputAudioFormat> *formats)
+//{
+// *formats << InputAudioFormat("APE", "ape", "mac");
+// *formats << InputAudioFormat("FLAC", "flac", "flac");
+// *formats << InputAudioFormat("WavPack", "wv", "wvunpack");
+// *formats << InputAudioFormat("TTA", "tta", "ttaenc");
+// *formats << InputAudioFormat("WAV", "wav", "");
+//}
 
-/************************************************
+///************************************************
 
- ************************************************/
-InputAudioFormat::InputAudioFormat(const QString &name, const QString &ext, const QString &program):
- mName(name),
- mExt(ext),
- mProgram(program)
-{
-}
+// ************************************************/
+//InputAudioFormat::InputAudioFormat(const QString &name, const QString &ext, const QString &program):
+// mName(name),
+// mExt(ext),
+// mProgram(program)
+//{
+//}
 
 
-/************************************************
+///************************************************
 
- ************************************************/
-QList<InputAudioFormat> InputAudioFormat::allFormats()
-{
- QList<InputAudioFormat> formats;
- if (formats.count() == 0)
- initInputAudioFormat(&formats);
+// ************************************************/
+//QList<InputAudioFormat> InputAudioFormat::allFormats()
+//{
+// QList<InputAudioFormat> formats;
+// if (formats.count() == 0)
+// initInputAudioFormat(&formats);
 
- return formats;
-}
+// return formats;
+//}
 
 
 /************************************************
@@ -75,7 +77,8 @@
 mValid(false),
 mSampleRate(0),
 mCdQuality(false),
- mDuration(0)
+ mDuration(0),
+ mFormat(0)
 
 {
 mValid = load();
@@ -93,6 +96,7 @@
 mSampleRate = other.mSampleRate;
 mCdQuality = other.mCdQuality;
 mDuration = other.mDuration;
+ mFormat = other.mFormat;
 }
 
 InputAudioFile &InputAudioFile::operator =(const InputAudioFile &other)
@@ -103,6 +107,7 @@
 mSampleRate = other.mSampleRate;
 mCdQuality = other.mCdQuality;
 mDuration = other.mDuration;
+ mFormat = other.mFormat;
 return *this;
 }
 
@@ -126,79 +131,28 @@
 return false;
 }
 
- QString shntool = QDir::toNativeSeparators(settings->value(Settings::Prog_Shntool).toString());
- if (shntool.isEmpty())
- {
- qWarning() << "Program shntool not found.";
- mErrorString = QObject::tr("I can't find program %1.").arg("shntool");
- return false;
- }
-
- QProcess proc;
 
- QStringList args;
- args << "info";
- args << QDir::toNativeSeparators(mFileName);
-
- proc.start(shntool, args);
-
- if (!proc.waitForFinished())
+ mFormat = AudioFormat::formatForFile(mFileName);
+ if (!mFormat)
 {
- qWarning("------------------------------------");
- qWarning() << "Test audio command:" << (shntool + " " + args.join(" "));
- qWarning() << "shntool info waitForFinished failed";
- qWarning() << proc.readAllStandardError();
- qWarning("------------------------------------");
+ mErrorString = QObject::tr("File %1 is not a supported audio file. "
+ " Verify that all required programs are installed and in your preferences.").arg(mFileName);
+
 return false;
 }
 
-
- if (proc.exitCode() != 0)
+ Decoder dec(*mFormat);
+ if (!dec.open(mFileName))
 {
- qWarning("------------------------------------");
- qWarning() << "Test audio command:" << (shntool + " " + args.join(" "));
- qWarning() << "shntool info nonzero exit code:" << proc.exitCode();
- qWarning() << proc.readAllStandardError();
- qWarning("------------------------------------");
 mErrorString = QObject::tr("File %1 is not a supported audio file. "
 " Verify that all required programs are installed and in your preferences.").arg(mFileName);
+ mErrorString += ": " + dec.errorString();
 return false;
 }
 
- QTextStream stream(&proc);
- while (!stream.atEnd())
- {
- QString line = stream.readLine();
- QString name = QString(line).section(':', 0, 0).toUpper().trimmed();
- QString value =QString(line).section(':', 1).trimmed();
-
- if (name == "SAMPLES/SEC")
- {
- mSampleRate = value.toInt();
- continue;
- }
-
- if (name == "CD QUALITY" && value.toUpper() == "YES")
- {
- mCdQuality = true;
- continue;
- }
-
-
- if (name == "LENGTH")
- {
- // 0h 0m 3s - Length: 0:03.00
- // 1h 2m 5s - Length: 62:05.00
- QRegExp re("(\\d+):(\\d+)\\.(\\d+)");
- if (re.exactMatch(value))
- {
- mDuration = re.cap(1).toInt() * 60 * 1000 +
- re.cap(2).toInt() * 1000 +
- re.cap(3).toInt();
- }
- continue;
- }
- }
+ mSampleRate = dec.wavHeader().sampleRate();
+ mCdQuality = dec.wavHeader().isCdQuality();
+ mDuration = dec.duration();
 
 return true;
 }

flacon-2.1.1.tar.gz/inputaudiofile.h -> flacon-3.1.1.tar.gz/inputaudiofile.h Changed

flacon-2.1.1.tar.gz/scanner.cpp -> flacon-3.1.1.tar.gz/scanner.cpp Changed

flacon-2.1.1.tar.gz/settings.cpp -> flacon-3.1.1.tar.gz/settings.cpp Changed

@@ -24,6 +24,7 @@
 * END_COMMON_COPYRIGHT_HEADER */
 
 
+#include "formats/format.h"
 #include "settings.h"
 #include "inputaudiofile.h"
 #include "outformat.h"
@@ -53,14 +54,13 @@
 #endif
 
 QString Settings::mFileName;
+static Settings *inst = NULL;
 
 /************************************************
 
 ************************************************/
 Settings *Settings::instance()
 {
- static Settings *inst = 0;
-
 if (!inst)
 {
 if (mFileName.isEmpty())
@@ -79,6 +79,8 @@
 void Settings::setFileName(const QString &fileName)
 {
 mFileName = fileName;
+ delete inst;
+ inst = 0;
 }
 
 
@@ -143,8 +145,6 @@
 setDefaultValue(ConfigureDialog_Height, 425);
 
 
- mPrograms << "shntool";
-
 foreach(OutFormat *format, OutFormat::allFormats())
 {
 QHashIterator<QString, QVariant> i(format->defaultParameters());
@@ -159,16 +159,16 @@
 }
 
 
- foreach (InputAudioFormat format, InputAudioFormat::allFormats())
+ foreach (const AudioFormat *format, AudioFormat::inputFormats())
 {
- mPrograms << format.program();
+ mPrograms << format->decoderProgramName();
 }
 
 mPrograms.remove("");
 
 foreach(QString program, mPrograms)
 {
- if (value("Programs/" + program).toString().isEmpty())
+ if (!checkProgram(program))
 setValue("Programs/" + program, findProgram(program));
 }
 }
@@ -200,9 +200,6 @@
 // Internet ****************************
 case Inet_CDDBHost: return "Inet/CDDBHost";
 
- // Programs ****************************
- case Prog_Shntool: return "Programs/shntool";
-
 
 // Misc *********************************
 case Misc_LastDir: return "Misc/LastDirectory";

flacon-2.1.1.tar.gz/settings.h -> flacon-3.1.1.tar.gz/settings.h Changed

flacon-2.1.1.tar.gz/tests/CMakeLists.txt -> flacon-3.1.1.tar.gz/tests/CMakeLists.txt Changed

flacon-2.1.1.tar.gz/tests/data/testConvert/05.expected.cue -> flacon-3.1.1.tar.gz/tests/data/testConvert/05.expected.cue Changed

flacon-3.1.1.tar.gz/tests/inittestcase.cpp Added

@@ -0,0 +1,188 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+#include "testflacon.h"
+#include "tools.h"
+#include "converter/wavheader.h"
+#include "../settings.h"
+
+#include <QString>
+#include <QProcessEnvironment>
+#include <QFileInfo>
+#include <QDir>
+#include <QDebug>
+
+#ifdef Q_OS_WIN
+ #define PATH_ENV_SEPARATOR ';'
+ #define BINARY_EXT ".exe"
+
+#elif defined(Q_OS_OS2)
+ #define PATH_ENV_SEPARATOR ';'
+ #define BINARY_EXT ".exe"
+
+#else
+ #define PATH_ENV_SEPARATOR ':'
+ #define BINARY_EXT ""
+
+#endif
+
+
+/************************************************
+ *
+ ************************************************/
+QString findProgram(const QString &program)
+{
+ QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH").split(PATH_ENV_SEPARATOR);
+ foreach(QString path, paths)
+ {
+ QFileInfo fi(path + QDir::separator() + program + BINARY_EXT);
+ if (fi.exists() && fi.isExecutable())
+ return fi.absoluteFilePath();
+ }
+ return "";
+}
+
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::initTestCase()
+{
+ Settings::setFileName(TEST_OUT_DIR "/flacon.conf");
+
+ if (findProgram("mac").isEmpty()) QFAIL("mac program not found");
+ if (findProgram("flac").isEmpty()) QFAIL("flac program not found");
+ if (findProgram("wavpack").isEmpty()) QFAIL("wavpack program not found");
+ if (findProgram("ttaenc").isEmpty()) QFAIL("ttaenc program not found");
+
+ if (!QDir().mkpath(mTmpDir))
+ QTest::qFail(QString("Can't create directory '%1'").arg(mTmpDir).toLocal8Bit(), __FILE__, __LINE__);
+
+
+ mAudio_cd_wav = mTmpDir + "CD.wav";
+ mAudio_cd_ape = mTmpDir + "CD.ape";
+ mAudio_cd_flac = mTmpDir + "CD.flac";
+ mAudio_cd_wv = mTmpDir + "CD.wv";
+ mAudio_cd_tta = mTmpDir + "CD.tta";
+
+ createWavFile( mAudio_cd_wav, 900, StdWavHeader::Quality_Stereo_CD);
+ encodeAudioFile(mAudio_cd_wav, mAudio_cd_ape);
+ encodeAudioFile(mAudio_cd_wav, mAudio_cd_flac);
+ encodeAudioFile(mAudio_cd_wav, mAudio_cd_wv);
+ encodeAudioFile(mAudio_cd_wav, mAudio_cd_tta);
+
+
+ mAudio_24x96_wav = mTmpDir + "24x96.wav";
+ mAudio_24x96_ape = mTmpDir + "24x96.ape";
+ mAudio_24x96_flac = mTmpDir + "24x96.flac";
+ mAudio_24x96_wv = mTmpDir + "24x96.wv";
+ mAudio_24x96_tta = mTmpDir + "24x96.tta";
+
+ createWavFile( mAudio_24x96_wav, 900, StdWavHeader::Quality_Stereo_24_96);
+ encodeAudioFile(mAudio_24x96_wav, mAudio_24x96_ape);
+ encodeAudioFile(mAudio_24x96_wav, mAudio_24x96_flac);
+ encodeAudioFile(mAudio_24x96_wav, mAudio_24x96_wv);
+ encodeAudioFile(mAudio_24x96_wav, mAudio_24x96_tta);
+
+}
+
+QString safePath(const QString &path)
+{
+ QString res = path;
+ res = res.replace(' ', '_');
+ res = res.replace('\t', '_');
+ res = res.replace('\n', '_');
+ res = res.replace('/', '_');
+ return res;
+}
+
+
+QString TestFlacon::dir()
+{
+ QString test = QString::fromLocal8Bit(QTest::currentTestFunction());
+ QString subtest = QString::fromLocal8Bit(QTest::currentDataTag());
+
+
+ return QDir::cleanPath(QString("%1/%2/%3")
+ .arg(TEST_OUT_DIR)
+ .arg(safePath(test))
+ .arg(safePath(subtest)));
+
+}
+
+
+
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+bool removeRecursively(QString dirName)
+{
+ bool result = true;
+ QDir dir(dirName);
+
+ if (dir.exists(dirName))
+ {
+ foreach(QFileInfo fi, dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst))
+ {
+ if (fi.isDir())
+ result = removeRecursively(fi.absoluteFilePath());
+ else
+ result = QFile::remove(fi.absoluteFilePath());
+
+ if (!result)
+ return result;
+ }
+
+ result = dir.rmdir(dirName);
+ }
+
+ return result;
+}
+
+#endif
+
+void TestFlacon::init()
+{
+ static QString prevTestFunction;
+ if (prevTestFunction != QTest::currentTestFunction())
+ {
+ prevTestFunction = QTest::currentTestFunction();
+ mTestNum++;
+ }
+
+ QString dir = this->dir();
+
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+ removeRecursively(dir);
+#else
+ QDir(dir).removeRecursively();
+#endif
+ if (!QDir().mkpath(dir))
+ {
+ QTest::qFail(QString("Can't create directory '%1'").arg(dir).toLocal8Bit(), __FILE__, __LINE__);
+ }
+
+ Settings::setFileName(dir + "/flacon.conf");
+}
+

flacon-3.1.1.tar.gz/tests/test_convert.cpp Added

@@ -0,0 +1,372 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+#include "testflacon.h"
+#include "../settings.h"
+#include "outformat.h"
+#include "../converter/wavheader.h"
+#include "tools.h"
+#include "project.h"
+#include "../inputaudiofile.h"
+#include "../converter/converter.h"
+
+#include <QDir>
+#include <QDebug>
+
+
+
+
+class ConverterTester
+{
+public:
+ ConverterTester(const QString &cueFile,
+ const QString &audioFile,
+ const QString &expectedCue,
+ const QString &resultFiles);
+
+
+ void run(const QString &name);
+
+ Disk *disk() { return mDisk; }
+
+private:
+ Disk *mDisk;
+ QStringList mResultFiles;
+ QString mExpectedCue;
+ ConverterTester(const ConverterTester &other) {}
+};
+
+
+
+
+/************************************************
+
+ ************************************************/
+ConverterTester::ConverterTester(const QString &cueFile, const QString &audioFile, const QString &expectedCue, const QString &resultFiles)
+{
+ mResultFiles = resultFiles.split(';', QString::SkipEmptyParts);
+ mExpectedCue = expectedCue;
+ project->clear();
+ mDisk = loadFromCue(cueFile);
+ InputAudioFile audio(audioFile);
+ mDisk->setAudioFile(audio);
+ project->addDisk(mDisk);
+}
+
+/************************************************
+
+ ************************************************/
+void ConverterTester::run(const QString &name)
+{
+ Converter conv;
+ conv.setShowStatistic(false);
+ QEventLoop loop;
+ loop.connect(&conv, SIGNAL(finished()), &loop, SLOT(quit()));
+ conv.start();
+
+ if (!conv.isRunning())
+ {
+ QString msg;
+ mDisk->canConvert(&msg);
+ QFAIL(QString("Can't start converter: \"%1\"").arg(msg).toLocal8Bit());
+ }
+
+ loop.exec();
+
+ QDir outDir = QFileInfo(mDisk->track(0)->resultFilePath()).dir();
+ QStringList files = outDir.entryList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::Files);
+ project->clear();
+ if (!mExpectedCue.isEmpty())
+ QFile::copy(mExpectedCue, outDir.absoluteFilePath("expected.cue"));
+
+ QStringList missing;
+ foreach(QString f, mResultFiles)
+ {
+ QString file = f.section(':', 0, 0).trimmed();
+ QString hash = f.section(':', 1).trimmed();
+
+ if (files.removeAll(file) == 0)
+ missing << file;
+
+ if (!hash.isEmpty())
+ {
+ compareAudioHash(outDir.absoluteFilePath(file), hash);
+ }
+ }
+
+
+ QString msg = "";
+ if (!missing.isEmpty())
+ msg += QString("\nFiles not exists:\n *%1").arg(missing.join("\n *"));
+
+ if (!files.isEmpty())
+ msg += QString("\nFiles exists:\n *%1").arg(files.join("\n *"));
+
+
+ if (!mExpectedCue.isEmpty())
+ {
+ //QString resCueFile;
+ files = outDir.entryList(QStringList() << "*.cue", QDir::Files);
+ if (files.isEmpty())
+ {
+ msg += "\nResult CUE file not found.";
+ }
+ else
+ {
+ QString err;
+ if (!TestFlacon::compareCue(outDir.absoluteFilePath(files.first()), mExpectedCue, &err))
+ msg += "\n" + err;
+ }
+ }
+
+ if (!msg.isEmpty())
+ QFAIL(name.toLocal8Bit() + "\n" + msg.toLocal8Bit());
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testConvert()
+{
+
+ QFETCH(QString, cueFile);
+ QFETCH(QString, audioFile);
+ QFETCH(QString, expectedCue);
+ QFETCH(QString, tags);
+ QFETCH(QString, resultFiles);
+ QFETCH(bool, createCue);
+ QFETCH(int, preGapType);
+
+ settings->setValue(Settings::OutFiles_Directory, dir());
+ settings->setValue(Settings::OutFiles_Pattern, "%a/%n - %t");
+ settings->setValue(Settings::OutFiles_Format, "WAV");
+ settings->setValue(Settings::PerTrackCue_FlaconTags, false);
+ settings->setValue(Settings::PerTrackCue_Create, createCue);
+ settings->setValue(Settings::PerTrackCue_Pregap, OutFormat::preGapTypeToString(OutFormat::PreGapType(preGapType)));
+ settings->setValue(Settings::OutFiles_Directory, dir());
+ settings->setValue(Settings::Encoder_TmpDir, "");
+
+ QString srcAudioFile = audioFile.section(':', 0, 0);
+ QString destAudioFile = audioFile.section(':', 1);
+ if (!destAudioFile.isEmpty())
+ {
+ destAudioFile = dir() + "/" + destAudioFile;
+ QFileInfo(destAudioFile).dir().mkpath(".");
+ QFile::copy(srcAudioFile, destAudioFile);
+ }
+ else
+ {
+ destAudioFile = srcAudioFile;
+ }
+
+ ConverterTester conv(
+ cueFile,
+ destAudioFile,
+ expectedCue,
+ resultFiles
+ );
+
+ foreach (QString line, tags.split(';'))
+ {
+ line = line.trimmed();
+ if (line.isEmpty())
+ continue;
+
+ int n = line.section(' ', 0, 0).toInt() - 1;

flacon-3.1.1.tar.gz/tests/test_decoder.cpp Added

@@ -0,0 +1,241 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "testflacon.h"
+#include "tools.h"
+#include "../converter/decoder.h"
+#include "../formats/wav.h"
+#include "../formats/flac.h"
+
+#include <QTest>
+#include <QVector>
+#include <QDebug>
+
+struct TestTrack {
+ QString start;
+ QString end;
+ QString hash;
+};
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testDecoder()
+{
+ QFETCH(QStringList, data);
+ QString inputFile = data.first();
+
+ QVector<TestTrack> tracks;
+ for (int i=1; i < data.count(); i+=3)
+ {
+ TestTrack track = {data.at(i), data.at(i+1), data.at(i+2)};
+ tracks << track;
+ }
+
+
+ // Flacon decoder ___________________________
+ const AudioFormat *format = AudioFormat::formatForFile(inputFile);
+ if (!format)
+ QFAIL("Unknown format");
+
+ Decoder decoder(*format);
+ if (!decoder.open(inputFile))
+ QFAIL(QString("Can't open input file '%1': %2").arg(inputFile, decoder.errorString()).toLocal8Bit());
+
+ for (int i=0; i < tracks.count(); ++i)
+ {
+ TestTrack track = tracks.at(i);
+
+ QString flaconFile = QString("%1/%2-flacon.wav").arg(dir()).arg(i + 1, 3, 10, QChar('0'));
+
+ bool res = decoder.extract(
+ CueTime(track.start),
+ CueTime(track.end),
+ flaconFile);
+
+ if (!res)
+ QFAIL(QString("Can't extract file '%1' [%2-%3]: %4")
+ .arg(inputFile)
+ .arg(track.start, track.end)
+ .arg(decoder.errorString()).toLocal8Bit());
+ }
+ decoder.close();
+
+
+ // Checks ___________________________________
+ for (int i=0; i < tracks.count(); ++i)
+ {
+ compareAudioHash(
+ QString("%1/%2-flacon.wav").arg(dir()).arg(i + 1, 3, 10, QChar('0')),
+ tracks.at(i).hash);
+ }
+
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testDecoder_data()
+{
+ QTest::addColumn<QStringList>("data");
+
+
+ // Wav ______________________________________
+ QTest::newRow("WAV 001 cd")
+ << (QStringList()
+ << mAudio_cd_wav
+ << "00:00:00" << "00:30:00" << "7d6351521a02b625905edd28970b5a73"
+ << "00:30:00" << "01:30:00" << "ac122fd6541d84bd3fad555f3f0a67df"
+ << "01:30:00" << "02:30:00" << "128aa3a57539d70cdb225a9b1b76a3c2"
+ );
+
+ QTest::newRow("WAV 002 cd")
+ << (QStringList()
+ << mAudio_cd_wav
+ << "00:00:10" << "00:30:00" << "2310ce664e1dc134ccbf8af5b52710bc"
+ << "00:30:00" << "01:30:20" << "26575693c3c50c4f91563769ec9dee02"
+ << "01:30:20" << "02:30:30" << "f0c8971a53aa4be86093da31145b5d87"
+ );
+
+ QTest::newRow("WAV 003 24x96")
+ << (QStringList()
+ << mAudio_24x96_wav
+ << "00:00:000" << "00:30:000" << "a20d655209861b734d96e79e80e967cd"
+ << "00:30:000" << "01:30:000" << "f53a6b3612b407fc1c42a755d1130e62"
+ << "01:30:000" << "02:30:000" << "ac3eb3dec93094791e5358f9151fadd0"
+ );
+
+
+
+ // Flac _____________________________________
+ QTest::newRow("FLAC 001 cd")
+ << (QStringList()
+ << mAudio_cd_flac
+ << "00:00:00" << "00:30:00" << "7d6351521a02b625905edd28970b5a73"
+ << "00:30:00" << "01:30:00" << "ac122fd6541d84bd3fad555f3f0a67df"
+ << "01:30:00" << "02:30:00" << "128aa3a57539d70cdb225a9b1b76a3c2"
+ );
+
+ QTest::newRow("FLAC 002 cd")
+ << (QStringList()
+ << mAudio_cd_flac
+ << "00:00:10" << "00:30:00" << "2310ce664e1dc134ccbf8af5b52710bc"
+ << "00:30:00" << "01:30:20" << "26575693c3c50c4f91563769ec9dee02"
+ << "01:30:20" << "02:30:30" << "f0c8971a53aa4be86093da31145b5d87"
+ );
+
+ QTest::newRow("FLAC 003 24x96")
+ << (QStringList()
+ << mAudio_24x96_flac
+ << "00:00:000" << "00:30:000" << "a20d655209861b734d96e79e80e967cd"
+ << "00:30:000" << "01:30:000" << "f53a6b3612b407fc1c42a755d1130e62"
+ << "01:30:000" << "02:30:000" << "ac3eb3dec93094791e5358f9151fadd0"
+ );
+
+
+ // APE ______________________________________
+ QTest::newRow("APE 001 cd")
+ << (QStringList()
+ << mAudio_cd_ape
+ << "00:00:00" << "00:30:00" << "7d6351521a02b625905edd28970b5a73"
+ << "00:30:00" << "01:30:00" << "ac122fd6541d84bd3fad555f3f0a67df"
+ << "01:30:00" << "02:30:00" << "128aa3a57539d70cdb225a9b1b76a3c2"
+ );
+
+ QTest::newRow("APE 002 cd")
+ << (QStringList()
+ << mAudio_cd_ape
+ << "00:00:10" << "00:30:00" << "2310ce664e1dc134ccbf8af5b52710bc"
+ << "00:30:00" << "01:30:20" << "26575693c3c50c4f91563769ec9dee02"
+ << "01:30:20" << "02:30:30" << "f0c8971a53aa4be86093da31145b5d87"
+ );
+
+ QTest::newRow("APE 003 24x96")
+ << (QStringList()
+ << mAudio_24x96_ape
+ << "00:00:000" << "00:30:000" << "a20d655209861b734d96e79e80e967cd"
+ << "00:30:000" << "01:30:000" << "f53a6b3612b407fc1c42a755d1130e62"
+ << "01:30:000" << "02:30:000" << "ac3eb3dec93094791e5358f9151fadd0"
+ );
+
+
+ // TTA ______________________________________
+ QTest::newRow("TTA 001 cd")
+ << (QStringList()
+ << mAudio_cd_tta
+ << "00:00:00" << "00:30:00" << "7d6351521a02b625905edd28970b5a73"
+ << "00:30:00" << "01:30:00" << "ac122fd6541d84bd3fad555f3f0a67df"
+ << "01:30:00" << "02:30:00" << "128aa3a57539d70cdb225a9b1b76a3c2"
+ );
+
+ QTest::newRow("TTA 002 cd")
+ << (QStringList()
+ << mAudio_cd_tta

flacon-3.1.1.tar.gz/tests/test_format.cpp Added

@@ -0,0 +1,141 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "testflacon.h"
+#include "tools.h"
+#include "../formats/format.h"
+#include "../formats/wav.h"
+#include "../formats/flac.h"
+#include "../settings.h"
+
+#include <QTest>
+#include <QString>
+#include <QBuffer>
+#include <QDebug>
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testFormatWavLast()
+{
+ if (AudioFormat::allFormats().last()->ext() != "wav")
+ QFAIL("Last format is not wav in allFormats.");
+
+
+ if (AudioFormat::inputFormats().last()->ext() != "wav")
+ QFAIL("Last format is not wav in inputFormats.");
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testFormat()
+{
+ QFETCH(QString, testdata);
+ QFETCH(QString, ext);
+
+ QBuffer data;
+ data.open(QBuffer::ReadWrite);
+ writeHexString(testdata, &data);
+ data.seek(0);
+
+ const AudioFormat *format = AudioFormat::formatForFile(&data);
+ if (!format)
+ QFAIL("Can't find format");
+
+ if (format->ext() != ext)
+ QFAIL(QString("Incorrect format found:\n found '%1',\n expected '%2' ").arg(format->ext(), ext).toLocal8Bit());
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testFormat_data()
+{
+ QTest::addColumn<QString>("testdata");
+ QTest::addColumn<QString>("ext");
+
+ QTest::newRow("01 WAV")
+ << "52 49 46 46" // RIFF
+ << "wav";
+
+ QTest::newRow("02 FLAC")
+ << "66 4C 61 43" // fLaC
+ << "flac";
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testFormatFromFile()
+{
+ QFETCH(QString, filename);
+ QFETCH(QString, ext);
+
+ const AudioFormat *format = AudioFormat::formatForFile(filename);
+ if (!format)
+ QFAIL("Can't find format");
+
+ if (format->ext() != ext)
+ QFAIL(QString("Incorrect format found:\n found '%1',\n expected '%2' ").arg(format->ext(), ext).toLocal8Bit());
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testFormatFromFile_data()
+{
+ QTest::addColumn<QString>("filename");
+ QTest::addColumn<QString>("ext");
+
+ // WAV ______________________________________
+ QTest::newRow("WAV 01") << mAudio_cd_wav << "wav";
+ QTest::newRow("WAV 02") << mAudio_24x96_wav << "wav";
+
+ // FLAC _____________________________________
+ QTest::newRow("FLAC 01") << mAudio_cd_flac << "flac";
+ QTest::newRow("FLAC 02") << mAudio_24x96_flac << "flac";
+
+ // APE ______________________________________
+ QTest::newRow("APE 01") << mAudio_cd_ape << "ape";
+ QTest::newRow("APE 02") << mAudio_24x96_ape << "ape";
+
+ // TTA ______________________________________
+ QTest::newRow("TTA 01") << mAudio_cd_tta << "tta";
+ QTest::newRow("TTA 02") << mAudio_24x96_tta << "tta";
+
+ // WV ______________________________________
+ QTest::newRow("WV 01") << mAudio_cd_wv << "wv";
+ QTest::newRow("WV 02") << mAudio_24x96_wv << "wv";
+
+}

flacon-3.1.1.tar.gz/tests/test_inputaudiofile.cpp Added

@@ -0,0 +1,122 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "testflacon.h"
+#include "tools.h"
+#include "../formats/format.h"
+//#include "../formats/wav.h"
+//#include "../formats/flac.h"
+//#include "../settings.h"
+#include "../inputaudiofile.h"
+
+#include <QTest>
+#include <QString>
+#include <QBuffer>
+#include <QDebug>
+
+
+void TestFlacon::testInputAudioFile()
+{
+ QFETCH(QString, fileName);
+ QFETCH(QString, duration);
+ QFETCH(QString, format);
+
+ uint dur = duration.toInt();
+
+
+ InputAudioFile ia(fileName);
+ if (!ia.isValid())
+ {
+ FAIL(QString("Can't open '%1': %2").arg(fileName, ia.errorString()));
+ return;
+ }
+
+ QCOMPARE(ia.duration(), dur);
+ QCOMPARE(ia.format()->name(), format);
+}
+
+
+void TestFlacon::testInputAudioFile_data()
+{
+ QTest::addColumn<QString>("fileName");
+ QTest::addColumn<QString>("duration");
+ QTest::addColumn<QString>("format");
+
+ QTest::newRow("01 mAudio_cd_ape")
+ << mAudio_cd_ape
+ << "900000"
+ << "APE";
+
+ QTest::newRow("02 mAudio_cd_flac")
+ << mAudio_cd_flac
+ << "900000"
+ << "FLAC";
+
+
+ QTest::newRow("03 mAudio_cd_tta")
+ << mAudio_cd_tta
+ << "900000"
+ << "TTA";
+
+ QTest::newRow("04 mAudio_cd_wav")
+ << mAudio_cd_wav
+ << "900000"
+ << "WAV";
+
+ QTest::newRow("05 mAudio_cd_wv")
+ << mAudio_cd_wv
+ << "900000"
+ << "WavPack";
+
+
+
+ QTest::newRow("06 mAudio_24x96_ape")
+ << mAudio_24x96_ape
+ << "900000"
+ << "APE";
+
+ QTest::newRow("07 mAudio_24x96_flac")
+ << mAudio_24x96_flac
+ << "900000"
+ << "FLAC";
+
+
+ QTest::newRow("08 mAudio_24x96_tta")
+ << mAudio_24x96_tta
+ << "900000"
+ << "TTA";
+
+ QTest::newRow("09 mAudio_24x96_wav")
+ << mAudio_24x96_wav
+ << "900000"
+ << "WAV";
+
+ QTest::newRow("10 mAudio_24x96_wv")
+ << mAudio_24x96_wv
+ << "900000"
+ << "WavPack";
+
+}

flacon-3.1.1.tar.gz/tests/test_wavheader.cpp Added

@@ -0,0 +1,170 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "../converter/wavheader.h"
+#include "testflacon.h"
+#include "tools.h"
+#include <QTest>
+#include <QString>
+#include<QBuffer>
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testReadWavHeader()
+{
+ QFETCH(QString, testdata);
+ QFETCH(QString, file_size);
+ QFETCH(QString, data_size);
+ QFETCH(QString, duration);
+
+ quint32 fileSize = file_size.toLongLong();
+ quint32 dataSize = data_size.toLongLong();
+ quint64 uduration = duration.toLongLong();
+
+ try
+ {
+ QBuffer data;
+ data.open(QBuffer::ReadWrite);
+ writeHexString(testdata, &data);
+ data.seek(0);
+
+
+ WavHeader header;
+ header.load(&data);
+
+ QCOMPARE(header.fileSize(), fileSize);
+ QCOMPARE(header.dataSize(), dataSize);
+ QCOMPARE(header.duration(), uduration);
+ }
+ catch (char const *err)
+ {
+ QFAIL(err);
+ }
+
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testReadWavHeader_data()
+{
+ QTest::addColumn<QString>("testdata");
+ QTest::addColumn<QString>("file_size");
+ QTest::addColumn<QString>("data_size");
+ QTest::addColumn<QString>("duration");
+
+ QTest::newRow("1") <<
+ "52 49 46 46" // RIFF
+ "24 B9 4D 02" // file size - 8
+ "57 41 56 45" // WAVE
+
+ "66 6D 74 20" // "fmt "
+ "10 00 00 00" // Chunk size
+ "01 00" // AudioFormat
+ "02 00" // NumChannels
+
+ "44 AC 00 00" // mSampleRate
+ "10 B1 02 00" // mByteRate
+ "04 00" // mBlockAlign
+ "10 00" // mBitsPerSample
+
+ "64 61 74 61" // data
+ "00 B9 4D 02" // data size
+ "00"
+
+ << "38648108" // file size
+ << "38648064" // data size
+ << "219093" // duration 3 min 39 s 93 ms
+ ;
+
+
+ QTest::newRow("2") <<
+ "52 49 46 46" // RIFF
+ "46 B9 4D 02" // file size - 8
+ "57 41 56 45" // WAVE
+
+ "66 6D 74 20" // "fmt "
+ "10 00 00 00" // Chunk size
+ "01 00" // AudioFormat
+ "02 00" // NumChannels
+
+ "44 AC 00 00" // mSampleRate
+ "10 B1 02 00" // mByteRate
+ "04 00" // mBlockAlign
+ "10 00" // mBitsPerSample
+
+ "4C 49 53 54" // LIST
+ "1A 00 00 00" // Chunk size
+ "49 4E 46 4F"
+ "49 53 46 54"
+ "0E 00 00 00"
+ "4C 61 76 66"
+ "35 37 2E 34"
+ "31 2E 31 30"
+ "30 00 "
+
+ "64 61 74 61" // data
+ "00 B9 4D 02" // data size
+ "00"
+
+ << "38648142" // file size
+ << "38648064" // data size
+ << "219093" // duration 3 min 39 s 93 ms
+ ;
+
+
+ QTest::newRow("3") <<
+ "52 49 46 46" // RIFF
+ "24 A3 23 A8" // file size - 8
+ "57 41 56 45" // WAVE
+
+ "66 6D 74 20" // "fmt "
+ "10 00 00 00" // Chunk size
+ "01 00" // AudioFormat
+ "02 00" // NumChannels
+
+ "00 EE 02 00" // mSampleRate
+ "00 94 11 00" // mByteRate
+ "06 00" // mBlockAlign
+ "18 00" // mBitsPerSample
+
+ "64 61 74 61" // data
+ "00 A3 23 A8" // data size
+
+ << "2820907820" // file size
+ << "2820907776" // data size
+ << "2448704" // duration 40 min 48 s 704 ms
+ ;
+
+}
+
+
+
+

flacon-2.1.1.tar.gz/tests/testflacon.cpp -> flacon-3.1.1.tar.gz/tests/testflacon.cpp Changed

@@ -25,28 +25,27 @@
 
 
 #include "testflacon.h"
+#include "tools.h"
 #include "../disk.h"
 #include "../settings.h"
 #include "../project.h"
 #include "../inputaudiofile.h"
 #include "converter/converter.h"
+#include "converter/wavheader.h"
+#include "converter/splitter.h"
 #include "outformat.h"
 
 #include <QTest>
-#include <QFile>
-#include <QFileInfo>
 #include <QDebug>
-#include <QProcessEnvironment>
-#include <QSettings>
-#include <QDir>
 #include <QProcess>
+#include <QBuffer>
+#include <QFileInfo>
+#include <QDir>
+#include <QThreadPool>
 
 #define protected public;
 
-#define FAIL(message) \
-do {\
- QTest::qFail(message, __FILE__, __LINE__);\
-} while (0)
+
 
 #ifdef Q_OS_WIN
 #define USE_DEV_RANDOM 0
@@ -56,20 +55,8 @@
 #define USE_DEV_RANDOM 1
 #endif
 
+int TestFlacon::mTestNum = -1;
 
-/************************************************
- *
- ************************************************/
-Disk *loadFromCue(const QString &cueFile)
-{
- CueReader cueReader(cueFile);
- if (!cueReader.isValid())
- FAIL(cueReader.errorString().toLocal8Bit());
-
- Disk *res = new Disk();
- res->loadFromCue(cueReader.disk(0));
- return res;
-}
 
 
 /************************************************
@@ -84,77 +71,6 @@
 }
 
 
-/************************************************
-
- ************************************************/
-void TestFlacon::initTestCase()
-{
- QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, QString::fromLocal8Bit(TEST_OUT_DIR));
- QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QString::fromLocal8Bit(TEST_OUT_DIR));
-
- QString shntool = settings->findProgram("shntool");
- if (shntool.isEmpty())
- FAIL(QString("Program \"%1\" not found.").arg("shntool").toLocal8Bit());
-
- settings->setValue(Settings::Prog_Shntool, shntool);
- settings->sync();
-
- mFfmpeg = settings->findProgram("avconv");
- if (mFfmpeg.isEmpty())
- mFfmpeg = settings->findProgram("ffmpeg");
-
- if (mFfmpeg.isEmpty())
- FAIL(QString("Program \"%1\" not found.").arg("avconv/ffmpeg").toLocal8Bit());
-
- mCdAudioFile = mTmpDir + "CD.wav";
- createAudioFile(mFfmpeg, mCdAudioFile, 900, true);
-
- mHdAudioFile = mTmpDir + "HD.wav";
- createAudioFile(mFfmpeg, mHdAudioFile, 900, false);
-}
-
-
-/************************************************
-
- ************************************************/
-void TestFlacon::createAudioFile(const QString &program, const QString &fileName, int duration, bool cdQuality)
-{
- if (QFileInfo(fileName).exists())
- return;
-
- QStringList args;
-# if USE_DEV_RANDOM
- args << "-y"; // Overwrite output files."
- args << "-ar" << (cdQuality ? "44100" : " 48000");
- args << "-f" << "s16le";
- args << "-acodec" << "pcm_s16le";
- args << "-ac" << "2";
- args << "-i" << "/dev/urandom";
- args << "-t" << QString("%1").arg(duration);
- args << fileName;
-#else
- args << "-y"; // Overwrite output files."
- args << "-t" << QString("%1").arg(duration);
- args << "-f" << "lavfi";
- args << "-i" << "anullsrc";
- args << "-ar" << (cdQuality ? "44100" : " 48000");
- args << "-acodec" << "pcm_s16le";
- args << "-ac" << "2";
- args << QDir::toNativeSeparators(fileName);
-#endif
-
- QProcess proc;
- //proc.setProcessChannelMode(QProcess::ForwardedChannels);
-
- proc.start(program, args);
- proc.waitForFinished(3 * 60 * 10000);
- if (proc.exitCode() != 0)
- {
- QString err = proc.readAllStandardError();
- QFAIL(QString("Can't create audio file: %1").arg(err).toLocal8Bit());
- }
-}
-
 
 /************************************************
 
@@ -271,6 +187,8 @@
 }
 
 
+
+
 /************************************************
 
 ************************************************/
@@ -278,7 +196,7 @@
 {
 if (mStandardDisk == 0)
 {
- QString cueFile = mTmpDir + "testTrackResultFileName.cue";
+ QString cueFile = dir() + "testTrackResultFileName.cue";
 
 QStringList cue;
 cue << "REM GENRE \"Genre\"";
@@ -485,344 +403,9 @@
 }
 
 
-/************************************************
-
- ************************************************/
-ConverterTester::ConverterTester(const QString &cueFile, const QString &audioFile, const QString &expectedCue, const QString &resultFiles)
-{
- mResultFiles = resultFiles.split(';', QString::SkipEmptyParts);
- mExpectedCue = expectedCue;
- project->clear();
- mDisk = loadFromCue(cueFile);
- InputAudioFile audio(audioFile);
- mDisk->setAudioFile(audio);
- project->addDisk(mDisk);
-}
-
-/************************************************
-
- ************************************************/
-void ConverterTester::run(const QString &name)
-{
- Converter conv;
- QEventLoop loop;
- loop.connect(&conv, SIGNAL(finished()), &loop, SLOT(quit()));
- conv.start();
-
- if (!conv.isRunning())
- {
- QString msg;
- mDisk->canConvert(&msg);
- QFAIL(QString("Can't start converter: \"%1\"").arg(msg).toLocal8Bit());
- }
-
- loop.exec();
-
- QDir outDir = QFileInfo(mDisk->track(0)->resultFilePath()).dir();
- QStringList files = outDir.entryList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::Files);
- project->clear();
-
- QStringList missing;
- foreach(QString f, mResultFiles)
- {
- if (files.removeAll(f) == 0)

flacon-2.1.1.tar.gz/tests/testflacon.h -> flacon-3.1.1.tar.gz/tests/testflacon.h Changed

@@ -27,6 +27,7 @@
 #ifndef TEST_FLACON_H
 #define TEST_FLACON_H
 
+#include <QTest>
 #include <QObject>
 #include <QStringList>
 #include <QMap>
@@ -35,27 +36,6 @@
 
 #define SettingsValues QMap<QString, QVariant>
 
-class ConverterTester
-{
-public:
- ConverterTester(const QString &cueFile,
- const QString &audioFile,
- const QString &expectedCue,
- const QString &resultFiles);
-
-
- void run(const QString &name);
-
- Disk *disk() { return mDisk; }
-
-private:
- Disk *mDisk;
- QStringList mResultFiles;
- QString mExpectedCue;
-
- ConverterTester(const ConverterTester &other) {}
-};
-
 class TestFlacon : public QObject
 {
 Q_OBJECT
@@ -72,6 +52,24 @@
 
 private slots:
 void initTestCase();
+ void init();
+
+ void testReadWavHeader();
+ void testReadWavHeader_data();
+
+ void testFormatWavLast();
+
+ void testFormat();
+ void testFormat_data();
+
+ void testFormatFromFile();
+ void testFormatFromFile_data();
+
+ void testInputAudioFile();
+ void testInputAudioFile_data();
+
+ void testDecoder();
+ void testDecoder_data();
 
 void testByteArraySplit_data();
 void testByteArraySplit();
@@ -102,11 +100,10 @@
 void testFindCueFile_data();
 void testFindCueFile();
 
-
 void testConvert();
+ void testConvert_data();
 
 private:
- void createAudioFile(const QString &program, const QString &fileName, int duration, bool cdQuality);
 void writeTextFile( const QString &fileName, const QString &content);
 void writeTextFile( const QString &fileName, const QStringList &content);
 
@@ -116,17 +113,36 @@
 void checkFileNotExists(const QString &fileName);
 
 void applySettings(const SettingsValues &config);
+ QString dir();
 
 Disk *standardDisk();
 
- QString mFfmpeg;
- QString mCdAudioFile;
- QString mHdAudioFile;
+ QString mAudio_cd_wav;
+ QString mAudio_24x96_wav;
+
+ QString mAudio_cd_ape;
+ QString mAudio_24x96_ape;
+
+
+ QString mAudio_cd_flac;
+ QString mAudio_24x96_flac;
+
+ QString mAudio_cd_wv;
+ QString mAudio_24x96_wv;
+
+ QString mAudio_cd_tta;
+ QString mAudio_24x96_tta;
+
 const QString mTmpDir;
 const QString mDataDir;
 Disk *mStandardDisk;
+
+ static int mTestNum;
 };
 
+
+
 QStringList &operator<<(QStringList &list, int value);
 
+
 #endif // TEST_FLACON_H

flacon-3.1.1.tar.gz/tests/tools.cpp Added

@@ -0,0 +1,355 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "tools.h"
+
+#include <QTest>
+#include <QDir>
+#include <QFile>
+#include <QTextStream>
+#include <QProcess>
+#include <QCryptographicHash>
+#include <QIODevice>
+#include <QDebug>
+#include "../settings.h"
+#include "../cue.h"
+#include "../disk.h"
+
+
+/************************************************
+ *
+ ************************************************/
+QString calcAudioHash(const QString &fileName)
+{
+ QFile f(fileName);
+ f.open(QFile::ReadOnly);
+ QByteArray ba = f.read(1024);
+ int n = ba.indexOf("data");
+ f.seek(n + 8);
+
+ QCryptographicHash hash(QCryptographicHash::Md5);
+ while (!f.atEnd())
+ {
+ ba = f.read(1024 * 1024);
+ hash.addData(ba);
+ }
+
+ return hash.result().toHex();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+TestCueFile::TestCueFile(const QString &fileName):
+ mFileName(fileName)
+{
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestCueFile::setWavFile(const QString &value)
+{
+ mWavFile = value;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestCueFile::addTrack(const QString &index0, const QString &index1)
+{
+ mTracks << TestCueTrack(index0, index1);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestCueFile::addTrack(const QString &index1)
+{
+ addTrack("", index1);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestCueFile::write()
+{
+ QFile f(mFileName);
+ if (!f.open(QFile::WriteOnly | QFile::Truncate))
+ QFAIL(QString("Can't create cue file '%1': %2").arg(mFileName).arg(f.errorString()).toLocal8Bit());
+
+ QTextStream cue(&f);
+
+ cue << QString("FILE \"%1\" WAVE\n").arg(mWavFile);
+ for (int i=0; i < mTracks.count(); ++i)
+ {
+ TestCueTrack track = mTracks.at(i);
+
+ cue << QString("\nTRACK %1 AUDIO\n").arg(i + 1);
+ if (track.index0 != "")
+ cue << QString(" INDEX 00 %1\n").arg(track.index0);
+
+ if (track.index1 != "")
+ cue << QString(" INDEX 01 %1\n").arg(track.index1);
+ }
+
+ f.close();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QStringList shnSplit(const QString &cueFile, const QString &audioFile)
+{
+ QString dir = QFileInfo(cueFile).absoluteDir().absolutePath();
+ foreach (QFileInfo file, QDir(dir).entryInfoList(QStringList() << "*-shntool.wav"))
+ {
+ QFile::remove(file.absoluteFilePath());
+ }
+
+ QStringList args;
+ args << "split";
+ args << "-w";
+ args << "-q";
+ args << "-O" << "always";
+ args << "-n" << "%03d";
+ args << "-t" << "%n-shntool";
+ args << "-d" << dir;
+ args << "-f" << QDir::toNativeSeparators(cueFile);
+ args << QDir::toNativeSeparators(audioFile);
+ //qDebug() << args;
+
+ QProcess proc;
+
+ if (proc.execute("shntool", args) != 0)
+ {
+
+ FAIL("snhtool was crashed: " + proc.readAllStandardError());
+ }
+
+ QStringList res;
+ foreach (QFileInfo file, QDir(dir).entryInfoList(QStringList() << "*-shntool.wav"))
+ {
+ if (!file.absoluteFilePath().endsWith("000-shntool.wav"))
+ res << file.absoluteFilePath();
+ }
+
+ return res;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void compareAudioHash(const QString &file1, const QString &expected)
+{
+ if (calcAudioHash(file1) != expected)
+ {
+ QFAIL(QString("Compared hases are not the same for:\n"
+ " [%1] %2\n"
+ " [%3] %4\n")
+
+ .arg(calcAudioHash(file1))
+ .arg(file1)
+
+ .arg(expected)
+ .arg("expected")
+
+ .toLocal8Bit());
+ }
+ //QCOMPARE(calcAudioHash(file1), calcAudioHash(file2));
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void writeHexString(const QString &str, QIODevice *out)
+{
+ bool ok;
+ int i =0;

flacon-3.1.1.tar.gz/tests/tools.h Added

@@ -0,0 +1,103 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ * Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef TOOLS_H
+#define TOOLS_H
+
+#include <QString>
+#include <QStringList>
+#include <QVector>
+#include "wavheader.h"
+
+class QIODevice;
+class Disk;
+
+
+class TestCueFile
+{
+public:
+ explicit TestCueFile(const QString &fileName);
+
+ QString fileName() const { return mFileName; }
+
+ void setWavFile(const QString &value);
+ QString wavFile() const { return mWavFile; }
+
+ void addTrack(const QString &index0, const QString &index1);
+ void addTrack(const QString &index1);
+
+ void write();
+
+private:
+ struct TestCueTrack {
+ QString index0;
+ QString index1;
+
+ TestCueTrack():
+ index0(""),
+ index1("")
+ {
+ }
+
+
+ TestCueTrack(const QString &index1):
+ index0(""),
+ index1(index1)
+ {
+ }
+
+
+ TestCueTrack(const QString &index0, const QString &index1):
+ index0(index0),
+ index1(index1)
+ {
+ }
+
+
+ };
+
+ QString mFileName;
+ QString mWavFile;
+ QVector<TestCueTrack> mTracks;
+};
+
+
+QStringList shnSplit(const QString &cueFile, const QString &audioFile);
+QString calcAudioHash(const QString &fileName);
+void compareAudioHash(const QString &file1, const QString &expected);
+void writeHexString(const QString &str, QIODevice *out);
+void createWavFile(const QString &fileName, int duration, StdWavHeader::Quality quality);
+void encodeAudioFile(const QString &wavFileName, const QString &outFileName);
+void testFail(const QString &message, const char *file, int line);
+
+#define FAIL(message) \
+do {\
+ testFail(message, __FILE__, __LINE__); \
+} while (0)
+
+Disk *loadFromCue(const QString &cueFile);
+
+#endif // TOOLS_H

flacon-2.1.1.tar.gz/tools.cmake -> flacon-3.1.1.tar.gz/tools.cmake Changed

flacon-2.1.1.tar.gz/translations/flacon_cs.ts -> flacon-3.1.1.tar.gz/translations/flacon_cs.ts Changed

flacon-2.1.1.tar.gz/translations/flacon_de.ts -> flacon-3.1.1.tar.gz/translations/flacon_de.ts Changed

@@ -43,7 +43,7 @@
 </message>
 <message>
 <source>Extracts individual tracks from one big audio file containing the entire album.</source>
- <translation type="unfinished"/>
+ <translation>Einzelne Audiodateien aus einer großen Audiodatei extrahieren die ein ganzes Album enthält.</translation>
 </message>
 <message>
 <source>Copyright: %1-%2 %3</source>
@@ -72,11 +72,11 @@
 <message>
 <source>Bug tracker %1</source>
 <comment>About dialog, About tab</comment>
- <translation type="unfinished"/>
+ <translation>Bug Tracker %1</translation>
 </message>
 <message>
 <source>Flacon is translated into many languages thanks to the work of the Flacon translation teams on &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt;.</source>
- <translation type="unfinished"/>
+ <translation>Flacon wird dank der Hilfe der Flacon Übersetzer Teams auf &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt; in viele Sprachen übersetzt.</translation>
 </message>
 </context>
 <context>
@@ -255,11 +255,11 @@
 </message>
 <message>
 <source>Per track cue sheet</source>
- <translation type="unfinished"/>
+ <translation>Cue-Datei pro Stück</translation>
 </message>
 <message>
 <source>Create per track cue sheet</source>
- <translation type="unfinished"/>
+ <translation>Cue-Datei pro Stück erstellen</translation>
 </message>
 </context>
 <context>
@@ -495,7 +495,12 @@
 &lt;p&gt;
 In CBR mode, it sets the specific output bitrate.
 </source>
- <translation type="unfinished"/>
+ <translation>Legt die Ziel Bitrate in kb/s (6-256 pro Audikanal) fest.
+&lt;p&gt;
+Im VBR Modus bestimmt diese die durchschnittliche Bitrate für eine große und weitläufige Audiosammlung.
+&lt;p&gt;
+Im CBR Modus bestimmt diese die tatsächliche Bitrate.
+</translation>
 </message>
 </context>
 <context>
@@ -549,7 +554,7 @@
 </message>
 <message>
 <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
- <translation type="unfinished"/>
+ <translation>Das Cue Sheet enthält Informationen über mehrere Disks. Welche Disk soll verwendet werden?</translation>
 </message>
 </context>
 <context>
@@ -560,11 +565,11 @@
 </message>
 <message>
 <source>Cue file not set.</source>
- <translation type="unfinished"/>
+ <translation>Kein Cue Sheet ausgewählt. </translation>
 </message>
 <message>
 <source>Audio file shorter than expected from cue sheet.</source>
- <translation type="unfinished"/>
+ <translation>Audio Datei ist kürzer als im Cue Sheet angegeben.</translation>
 </message>
 </context>
 <context>
@@ -586,7 +591,7 @@
 <message>
 <source>I can&apos;t read %1 file</source>
 <comment>Encoder error. %1 is a file name.</comment>
- <translation type="unfinished"/>
+ <translation>Ich kann die Datei %1 nicht lesen</translation>
 </message>
 </context>
 <context>
@@ -598,7 +603,8 @@
 <message>
 <source>Sets compression level, between %1 (fastest) and %2 (highest compression).
 This only affects the file size. All settings are lossless.</source>
- <translation type="unfinished"/>
+ <translation>Kompressionsstärke angeben, zwischen %1 (am schnellsten) und %2 (höchste Kompression).
+Diese Einstellung wirkt sich nur auf die Dateigröße aus. Alle Einstellungen sind verlustfrei.</translation>
 </message>
 <message>
 <source>Disabled</source>
@@ -620,7 +626,10 @@
 
 The analysis can be performed on individual tracks, so that all tracks will be of equal volume on playback. 
 Using the album-gain analysis will preserve the volume differences within an album.</source>
- <translation type="unfinished"/>
+ <translation>ReplayGain ist ein Standard zur Anpassung der gehörten Lautstärke bei Computer Audioformaten.
+
+Die Analyse kann bei einzelnen Audiodateien durchgeführt werden, so dass diese anschließend mit gleicher Lautstärke wiedergegeben werden.
+Die Album-Gain Analyse behält die Lautstärkeunterschiede innerhalb eines Albums dabei bei.</translation>
 </message>
 <message>
 <source>%1 kbps</source>
@@ -907,7 +916,9 @@
 
 If the path is left empty or starts with &quot;.&quot; (dot), the result files will be placed in the same directory as the source.</source>
 <comment>Main form tooltip for &quot;Directory&quot; edit</comment>
- <translation type="unfinished"/>
+ <translation>Sie können das Zielverzeichnis auswählen. Sie können das Zielverzeichnis auch manuell angeben.
+
+Wird kein Zielverzeichnis angegeben oder beginnt es mit &quot;.&quot; (Punkt), werden die erzeugten Dateien im Quellverzeichnis gespeichert.</translation>
 </message>
 <message>
 <source>Use &quot;%1&quot;</source>
@@ -917,12 +928,12 @@
 <message>
 <source>Select cue file</source>
 <comment>OpenFile dialog title</comment>
- <translation type="unfinished"/>
+ <translation>Cue Sheet auswählen</translation>
 </message>
 <message>
 <source>Add cue or audio file</source>
 <comment>OpenFile dialog title</comment>
- <translation type="unfinished"/>
+ <translation>Cue- oder Audiodatei hinzufügen</translation>
 </message>
 <message>
 <source>Delete current pattern from history</source>
@@ -959,12 +970,12 @@
 <message>
 <source>%1 program</source>
 <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
- <translation type="unfinished"/>
+ <translation>%1 Programm</translation>
 </message>
 <message>
 <source>All files</source>
 <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
- <translation type="unfinished"/>
+ <translation>Alle Dateien</translation>
 </message>
 </context>
 <context>
@@ -975,7 +986,7 @@
 </message>
 <message>
 <source>File &lt;b&gt;%1&lt;/b&gt; is not a supported audio file. &lt;br&gt;&lt;br&gt;Verify that all required programs are installed and in your preferences.</source>
- <translation type="unfinished"/>
+ <translation>Datei &lt;b&gt;%1&lt;/b&gt; ist keine unterstützte Audiodatei. &lt;br&gt;&lt;br&gt; überprüfen Sie, dass alle benötigten Programme installiert und konfiguriert sind.</translation>
 </message>
 <message>
 <source> [disk %1]</source>
@@ -988,37 +999,37 @@
 </message>
 <message>
 <source>I can&apos;t write cue file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
- <translation type="unfinished"/>
+ <translation>Ich kann die Cue-Datei &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2 nicht schreiben</translation>
 </message>
 <message>
 <source>File &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
- <translation type="unfinished"/>
+ <translation>Datei &lt;b&gt;&quot;%1&quot;&lt;/b&gt; ist nicht vorhanden</translation>
 </message>
 <message>
 <source>&lt;b&gt;%1&lt;/b&gt; is not a valid cue file. Disk %2 has no tags.</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;%1&lt;/b&gt; ist keine gültige Cue-Datei. Disk %2 hat keine Tags.</translation>
 </message>
 <message>
 <source>The audio file name is not set</source>
- <translation type="unfinished"/>
+ <translation>Audiodateiname ist nicht festgelegt</translation>
 </message>
 <message>
 <source>you can&apos;t use &apos;ReplayGain&apos; for files with sample rates above 48kHz. Metaflac doesn&apos;t support such files.</source>
 <comment>This string should begin with a lowercase letter. This is a part of the complex sentence.</comment>
- <translation type="unfinished"/>
+ <translation>&apos;ReplayGain&apos; kann für Dateien mit einer Samplerate über 48kHz nicht verwendet werden, da Metaflac diese Dateien nicht unterstützt.</translation>
 </message>
 <message>
 <source>&lt;b&gt;%1&lt;/b&gt; is not a valid cue file. The cue sheet has no FILE tag.</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;%1&lt;/b&gt; ist keine gültige Cue-Datei. Die Cue-Datei hat keinen FILE Tag.</translation>
 </message>
 <message>
 <source>&lt;b&gt;%1&lt;/b&gt; is not a valid cue file. Incorrect track index at %2.</source>
 <comment>Cue parser error. %2 is file position</comment>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;%1&lt;/b&gt; ist keine gültige Cue-Datei. Falscher Track-Index bei %2.</translation>
 </message>
 <message>
 <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
- <translation type="unfinished"/>
+ <translation>Audiodatei &lt;b&gt;&quot;%1&quot;&lt;/b&gt; ist nicht vorhanden</translation>
 </message>
 </context>

flacon-2.1.1.tar.gz/translations/flacon_fr.ts -> flacon-3.1.1.tar.gz/translations/flacon_fr.ts Changed

flacon-2.1.1.tar.gz/translations/flacon_hu.desktop -> flacon-3.1.1.tar.gz/translations/flacon_hu.desktop Changed

flacon-2.1.1.tar.gz/translations/flacon_hu.ts -> flacon-3.1.1.tar.gz/translations/flacon_hu.ts Changed

@@ -3,43 +3,43 @@
 <name>AboutDialog</name>
 <message>
 <source>About Flacon</source>
- <translation type="unfinished"/>
+ <translation>Flacon névjegye</translation>
 </message>
 <message>
 <source>About</source>
- <translation type="unfinished"/>
+ <translation>About</translation>
 </message>
 <message>
 <source>Author</source>
- <translation type="unfinished"/>
+ <translation>Szerző</translation>
 </message>
 <message>
 <source>Thanks</source>
- <translation type="unfinished"/>
+ <translation>Köszönet</translation>
 </message>
 <message>
 <source>Translations</source>
- <translation type="unfinished"/>
+ <translation>Fordítások</translation>
 </message>
 <message>
 <source>External programs</source>
- <translation type="unfinished"/>
+ <translation>Külső alkalmazások</translation>
 </message>
 <message>
 <source>Homepage: %1</source>
- <translation type="unfinished"/>
+ <translation>Honlap: %1</translation>
 </message>
 <message>
 <source>License: %1</source>
- <translation type="unfinished"/>
+ <translation>Licenc: %1</translation>
 </message>
 <message>
 <source>Special thanks to:</source>
- <translation type="unfinished"/>
+ <translation>Különleges köszönet neki(k):</translation>
 </message>
 <message>
 <source>Flacon uses external programs. Many thanks to their authors!</source>
- <translation type="unfinished"/>
+ <translation>A Flacon külső programokat használ. Ezer köszönet a szerzőknek!</translation>
 </message>
 <message>
 <source>Extracts individual tracks from one big audio file containing the entire album.</source>
@@ -47,35 +47,35 @@
 </message>
 <message>
 <source>Copyright: %1-%2 %3</source>
- <translation type="unfinished"/>
+ <translation>%1 %2 használata - Copyright (C) %3</translation>
 </message>
 <message>
 <source>WavPack support patch</source>
- <translation type="unfinished"/>
+ <translation>Wavpack támogató patch</translation>
 </message>
 <message>
 <source>Application icon, Packaging</source>
- <translation type="unfinished"/>
+ <translation>Alkalmazás ikon, Csomagolás</translation>
 </message>
 <message>
 <source>Packaging, testing</source>
- <translation type="unfinished"/>
+ <translation>Csomagolás, tesztelés</translation>
 </message>
 <message>
 <source>Improvements in the UI</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Flacon is translated into many languages thanks to the work of the translation teams all over the world.</source>
- <translation type="unfinished"/>
+ <translation>Felületi fejlesztések</translation>
 </message>
 <message>
 <source>Flacon account on github.com</source>
- <translation type="unfinished"/>
+ <translation>Flacon fiók a github.com-on</translation>
 </message>
 <message>
 <source>Bug tracker %1</source>
 <comment>About dialog, About tab</comment>
+ <translation>Hibakövetés %1</translation>
+ </message>
+ <message>
+ <source>Flacon is translated into many languages thanks to the work of the Flacon translation teams on &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt;.</source>
 <translation type="unfinished"/>
 </message>
 </context>
@@ -84,149 +84,181 @@
 <message>
 <source>Auto detect</source>
 <comment>Codepage auto detection</comment>
- <translation type="unfinished"/>
+ <translation>Automatikus detektálás</translation>
 </message>
 <message>
 <source>Unicode (UTF-8)</source>
- <translation type="unfinished"/>
+ <translation>Unicode (UTF-8)</translation>
 </message>
 <message>
 <source>Unicode (UTF-16LE)</source>
- <translation type="unfinished"/>
+ <translation>Unicode (UTF-16LE)</translation>
 </message>
 <message>
 <source>Unicode (UTF-16BE)</source>
- <translation type="unfinished"/>
+ <translation>Unicode (UTF-16BE)</translation>
 </message>
 <message>
 <source>Cyrillic (Win-1251)</source>
- <translation type="unfinished"/>
+ <translation>Cyrillic (Win-1251)</translation>
 </message>
 <message>
 <source>Cyrillic (CP-866)</source>
- <translation type="unfinished"/>
+ <translation>Cyrillic (CP-866)</translation>
 </message>
 <message>
 <source>Latin-1 (ISO-8859-1)</source>
- <translation type="unfinished"/>
+ <translation>Latin-1 (ISO-8859-1)</translation>
 </message>
 <message>
 <source>Latin-2 (ISO-8859-2)</source>
- <translation type="unfinished"/>
+ <translation>Latin-2 (ISO-8859-2)</translation>
 </message>
 <message>
 <source>Latin-3 (ISO-8859-3)</source>
- <translation type="unfinished"/>
+ <translation>Latin-3 (ISO-8859-3)</translation>
 </message>
 <message>
 <source>Latin-4 (ISO-8859-4)</source>
- <translation type="unfinished"/>
+ <translation>Latin-4 (ISO-8859-4)</translation>
 </message>
 <message>
 <source>Latin-5 (ISO-8859-5)</source>
- <translation type="unfinished"/>
+ <translation>Latin-5 (ISO-8859-5)</translation>
 </message>
 <message>
 <source>Latin-6 (ISO-8859-6)</source>
- <translation type="unfinished"/>
+ <translation>Latin-6 (ISO-8859-6)</translation>
 </message>
 <message>
 <source>Latin-7 (ISO-8859-7)</source>
- <translation type="unfinished"/>
+ <translation>Latin-7 (ISO-8859-7)</translation>
 </message>
 <message>
 <source>Latin-8 (ISO-8859-8)</source>
- <translation type="unfinished"/>
+ <translation>Latin-8 (ISO-8859-8)</translation>
 </message>
 <message>
 <source>Latin-9 (ISO-8859-9)</source>
- <translation type="unfinished"/>
+ <translation>Latin-9 (ISO-8859-9)</translation>
 </message>
 <message>
 <source>Latin-10 (ISO-8859-10)</source>
- <translation type="unfinished"/>
+ <translation>Latin-10 (ISO-8859-10)</translation>
 </message>
 <message>
 <source>Latin-13 (ISO-8859-13)</source>
- <translation type="unfinished"/>
+ <translation>Latin-13 (ISO-8859-13)</translation>
 </message>
 <message>
 <source>Latin-14 (ISO-8859-14)</source>
- <translation type="unfinished"/>
+ <translation>Latin-14 (ISO-8859-14)</translation>
 </message>
 <message>
 <source>Latin-15 (ISO-8859-15)</source>
- <translation type="unfinished"/>
+ <translation>Latin-15 (ISO-8859-15)</translation>
 </message>
 <message>
 <source>Latin-16 (ISO-8859-16)</source>
- <translation type="unfinished"/>

flacon-2.1.1.tar.gz/translations/flacon_lt.desktop -> flacon-3.1.1.tar.gz/translations/flacon_lt.desktop Changed

flacon-2.1.1.tar.gz/translations/flacon_nb.ts -> flacon-3.1.1.tar.gz/translations/flacon_nb.ts Changed

flacon-2.1.1.tar.gz/translations/translators_de.info -> flacon-3.1.1.tar.gz/translations/translators_de.info Changed

flacon-3.1.1.tar.gz/translations/translators_hu.info Added

flacon-2.1.1.tar.gz/translations/translators_nb.info -> flacon-3.1.1.tar.gz/translations/translators_nb.info Changed

@@ -1,14 +1,14 @@
-_help = Don't translate this text, it is only help. I want to thank you in the "About" dialog. So, please fill the following information about yourself. The number does not matter, all the names will be displayed in alphabetical order.
+_help =    
 
 
-translator_1_nameEnglish = Translator 1. Harald H.
-translator_1_nameNative  = Translator 1. Harald H.
-translator_1_contact     = Translator 1. haarektrans@gmail.com
+translator_1_nameEnglish = Translator 1. Allan Nordhoey
+translator_1_nameNative  = Translator 1. Allan Nordhøy
+translator_1_contact     = Translator 1. epost@anotheragency.no
 
-translator_2_nameEnglish = Allan Nordhøy
-translator_2_nameNative  = Allan Nordhøy
-translator_2_contact     = epost@anotheragency.no
+translator_2_nameEnglish = Translator 2. Harald H.
+translator_2_nameNative  = Translator 2. Harald H.
+translator_2_contact     = Translator 2. haarektrans@gmail.com
 
-translator_3_nameEnglish = Translator 3. Your name in English.
-translator_3_nameNative  = Translator 3. Your name in the native language.
-translator_3_contact     = Translator 3. Contact information, email or web site address.
+translator_3_nameEnglish =  
+translator_3_nameNative  =  
+translator_3_contact     =

Changes of Revision 22