Packman Build Service PMBS

flacon.changes Changed

flacon.spec Changed

flacon-5.4.0.tar.gz/CMakeLists.txt -> flacon-5.5.1.tar.gz/CMakeLists.txt Changed

@@ -23,7 +23,7 @@
  #
  # END_COMMON_COPYRIGHT_HEADER
 
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.0.2)
 cmake_policy(SET CMP0028 NEW)
 if (POLICY CMP0071) 
     cmake_policy(SET CMP0071 NEW) 
@@ -32,8 +32,8 @@
 project(flacon)
 
 set(MAJOR_VERSION 5)
-set(MINOR_VERSION 4)
-set(PATCH_VERSION 0)
+set(MINOR_VERSION 5)
+set(PATCH_VERSION 1)
 #set(BETA_VERSION beta2)
 
 set(FLACON_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})
@@ -46,6 +46,7 @@
 add_definitions(-DFLACON_PATCH_VERSION=\"${PATCH_VERSION}\")
 add_definitions(-DFLACON_VERSION=\"${FLACON_VERSION}\")
 
+
 include("cmake/status_message.cmake")
 status_message("${PROJECT_NAME} ver. ${FLACON_VERSION}")
 status_message(" ")
@@ -248,6 +249,9 @@
 include_directories(${UCHARDET_INCLUDE_DIRS})
 link_directories(${UCHARDET_LIBRARY_DIRS})
 
+
+set(MAC_UPDATE_URL "https://flacon.github.io/download/feed.xml" CACHE STRING "The URL of updates appcast for MacOS")
+
 if (APPLE)
     FIND_LIBRARY(COCOA_LIBRARY Cocoa)
     set(LIBRARIES ${LIBRARIES} ${COCOA_LIBRARY})
@@ -273,6 +277,10 @@
 
 endif()
 
+if (FLATPAK_BUNDLE)
+	add_definitions(-DFLATPAK_BUNDLE=Yes)
+endif()
+
 add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES} ${QM_FILES} ${QRC_SOURCES} ${ENGINES_CPP} ${ENGINES_H} ${RESOURCES} ${TRANSLATORS_INFO_QRC})
 target_link_libraries(${PROJECT_NAME} ${LIBRARIES} ${QT_LIBRARIES} Qt5::Widgets Qt5::Network)
 
@@ -309,8 +317,14 @@
     file(APPEND ${_OUT_FILE} "${genericname_tag}\n")
 endfunction()
 
+function(CREATE_FLATPAK_METADATA_FILE _IN_FILE _OUT_FILE)
+    string(TIMESTAMP BUILD_DATE "%Y-%m-%d")
+    configure_file(${_IN_FILE} ${_OUT_FILE} @ONLY)
+endfunction()
+
 CREATE_DESKTOP_FILE(misc/${PROJECT_NAME}.desktop ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop translations/*.desktop)
 CREATE_PLIST_FILE(misc/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
+CREATE_FLATPAK_METADATA_FILE(misc/com.github.Flacon.metadata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/com.github.Flacon.metadata.xml)
 
 # Man page **************************************
 configure_file(
@@ -337,7 +351,8 @@
     install(FILES   ${QM_FILES}             DESTINATION ${TRANSLATIONS_DIR})
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1)
 
-    install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION "share/applications")
+    install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop        DESTINATION "share/applications")
+    install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/com.github.Flacon.metadata.xml DESTINATION "share/metainfo")
     install(FILES   images/mainicon/flacon-16x16.png   DESTINATION "share/icons/hicolor/16x16/apps"    RENAME "flacon.png")
     install(FILES   images/mainicon/flacon-32x32.png   DESTINATION "share/icons/hicolor/32x32/apps"    RENAME "flacon.png")
     install(FILES   images/mainicon/flacon-48x48.png   DESTINATION "share/icons/hicolor/48x48/apps"    RENAME "flacon.png")

flacon-5.4.0.tar.gz/cmake/build_type.cmake -> flacon-5.5.1.tar.gz/cmake/build_type.cmake Changed

flacon-5.4.0.tar.gz/converter/converter.h -> flacon-5.5.1.tar.gz/converter/converter.h Changed

flacon-5.4.0.tar.gz/converter/decoder.cpp -> flacon-5.5.1.tar.gz/converter/decoder.cpp Changed

@@ -34,8 +34,8 @@
 #include <QDir>
 #include <QDebug>
 
-#define MAX_BUF_SIZE 4096
-
+static const int MAX_BUF_SIZE = 4096;
+static const int READ_DELAY = 1000;
 
 
 /************************************************
@@ -107,7 +107,7 @@
 if (!mFile->open(QFile::ReadOnly))
 throw FlaconError(mFile->errorString());
 
- mWavHeader.load(mFile);
+ mWavHeader = WavHeader(mFile);
 mPos = mWavHeader.dataStartPos();
 }
 
@@ -129,7 +129,7 @@
 throw FlaconError(QString("[Decoder] Can't start '%1': %2")
 .arg(program, mProcess->errorString()));
 
- mWavHeader.load(mProcess);
+ mWavHeader = WavHeader(mProcess);
 mPos = mWavHeader.dataStartPos();
 }
 
@@ -170,6 +170,31 @@
 }
 }
 
+/************************************************
+ *
+ ************************************************/
+bool mustSkip(QIODevice *device, qint64 size, int msecs = READ_DELAY)
+{
+ static const int BUF_SIZE = 4096;
+
+ if (size == 0)
+ return true;
+
+ char buf[BUF_SIZE];
+ qint64 left = size;
+ while (left > 0)
+ {
+ device->bytesAvailable() || device->waitForReadyRead(msecs);
+ qint64 n = device->read(buf, qMin(qint64(BUF_SIZE), left));
+ if (n<0)
+ return false;
+
+ left -= n;
+ }
+
+ return true;
+}
+
 
 /************************************************
 *
@@ -194,7 +219,9 @@
 else
 be = timeToBytes(end, mWavHeader) + mWavHeader.dataStartPos();
 
- outDevice->write(StdWavHeader(be - bs, mWavHeader).toByteArray());
+ WavHeader hdr = mWavHeader;
+ hdr.resizeData(be - bs);
+ outDevice->write(hdr.toByteArray());
 
 qint64 pos = mPos;

flacon-5.4.0.tar.gz/converter/decoder.h -> flacon-5.5.1.tar.gz/converter/decoder.h Changed

flacon-5.4.0.tar.gz/converter/diskpipline.cpp -> flacon-5.5.1.tar.gz/converter/diskpipline.cpp Changed

@@ -132,13 +132,17 @@
 
 if (! dir.mkpath("."))
 {
- Messages::error(QObject::tr("I can't create directory \"%1\".").arg(dir.path()));
+ QString msg = QObject::tr("I can't create directory \"%1\".").arg(dir.path());
+ QString err = strerror(errno);
+ Messages::error(msg + " " + err);
 return false;
 }
 
 if (!QFileInfo(dir.path()).isWritable())
 {
- Messages::error(QObject::tr("I can't write to directory \"%1\".").arg(dir.path()));
+ QString msg = QObject::tr("I can't write to directory \"%1\".").arg(dir.path());
+ QString err = strerror(errno);
+ Messages::error(msg + " " + err);
 return false;
 }
 
@@ -519,8 +523,14 @@
 {
 // Track is ready, rename the file to the final name.
 QFile::remove(track->resultFilePath());
- QFile(outFileName).rename(track->resultFilePath());
 
+ QFile file(outFileName);
+ if (! file.rename(track->resultFilePath())) {
+ trackError(track, tr("I can't rename file:\n%1 to %2\n%3")
+ .arg(outFileName)
+ .arg(track->resultFilePath())
+ .arg(file.errorString()));
+ }
 
 mData->trackStates.insert(track, TrackState::OK);
 emit trackProgressChanged(*track, TrackState::OK, 0);

flacon-5.4.0.tar.gz/converter/diskpipline.h -> flacon-5.5.1.tar.gz/converter/diskpipline.h Changed

flacon-5.4.0.tar.gz/converter/encoder.cpp -> flacon-5.5.1.tar.gz/converter/encoder.cpp Changed

flacon-5.4.0.tar.gz/converter/encoder.h -> flacon-5.5.1.tar.gz/converter/encoder.h Changed

flacon-5.4.0.tar.gz/converter/gain.h -> flacon-5.5.1.tar.gz/converter/gain.h Changed

flacon-5.4.0.tar.gz/converter/wavheader.cpp -> flacon-5.5.1.tar.gz/converter/wavheader.cpp Changed

@@ -31,31 +31,23 @@
 #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
+static const char* WAV_RIFF = "RIFF";
+static const char* WAV_WAVE = "WAVE";
+static const char* WAV_FMT = "fmt ";
+static const char* WAV_DATA = "data";
 
+static const int READ_DELAY = 1000;
 
 /************************************************
 *
 ************************************************/
-inline bool mustRead(QIODevice *device, char *data, qint64 size, int msecs)
+inline bool mustRead(QIODevice *device, char *data, qint64 size, int msecs = READ_DELAY)
 {
 char *d = data;
 qint64 left = size;
 while (left > 0)
 {
- device->bytesAvailable() || device->waitForReadyRead(msecs);
+ device->bytesAvailable() || device->waitForReadyRead(msecs);
 qint64 n = device->read(d, left);
 if (n<0)
 return false;
@@ -71,24 +63,48 @@
 /************************************************
 *
 ************************************************/
-bool mustSkip(QIODevice *device, qint64 size, int msecs)
+QByteArray& operator<<(QByteArray& out, const char val[4])
 {
- if (size == 0)
- return true;
+ out += val;
+ return out;
+}
 
- char buf[BUF_SIZE];
- qint64 left = size;
- while (left > 0)
- {
- device->bytesAvailable() || device->waitForReadyRead(msecs);
- qint64 n = device->read(buf, qMin(qint64(BUF_SIZE), left));
- if (n<0)
- return false;
 
- left -= n;
- }
+/************************************************
+ *
+ ************************************************/
+QByteArray& operator<<(QByteArray& out, quint32 val)
+{
+ union {
+ quint32 n;
+ char bytes[4];
+ };
 
- return true;
+ n = qToLittleEndian(val);
+ out += bytes[0];
+ out += bytes[1];
+ out += bytes[2];
+ out += bytes[3];
+
+ return out;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QByteArray& operator<<(QByteArray& out, quint16 val)
+{
+ union {
+ quint32 n;
+ char bytes[2];
+ };
+
+ n = qToLittleEndian(val);
+ out += bytes[0];
+ out += bytes[1];
+
+ return out;
 }
 
 
@@ -102,6 +118,9 @@
 }
 
 
+/************************************************
+ *
+ ************************************************/
 struct SplitterError {
 int trackNum;
 QString msg;
@@ -158,12 +177,16 @@
 ************************************************/
 WavHeader::WavHeader():
 mFileSize(0),
+ mFmtSize(0),
 mFormat(WavHeader::Format_Unknown),
 mNumChannels(0),
 mSampleRate(0),
 mByteRate(0),
 mBlockAlign(0),
 mBitsPerSample(0),
+ mExtSize(0),
+ mValidBitsPerSample(0),
+ mChannelMask(0),
 mDataSize(0),
 mDataStartPos(0)
 {
@@ -171,123 +194,22 @@
 
 
 /************************************************
- *
- ************************************************/
-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;
- mFormat = base.format();
- mNumChannels = base.numChannels();
- mSampleRate = base.sampleRate();
- mByteRate = base.byteRate();
- mBlockAlign = base.blockAlign();
- mBitsPerSample = base.bitsPerSample();
-}
-
-
-/************************************************
- *
- ************************************************/
-StdWavHeader::StdWavHeader(quint32 dataSize, quint32 sampleRate, quint16 bitsPerSample, quint8 numChannels):
- WavHeader()
-{
- mDataSize = dataSize;
- mNumChannels = numChannels;
- mSampleRate = sampleRate;
- mBitsPerSample = bitsPerSample;
-
- mDataStartPos = CANONICAL_HEADER_SIZE;
- mFileSize = mDataStartPos + mDataSize;
- mFormat = Format_PCM;
- mByteRate = mSampleRate * mNumChannels * mBitsPerSample / 8;
- mBlockAlign = mNumChannels * mBitsPerSample / 8;
-}
-
-
-/************************************************
- *
- ************************************************/
-StdWavHeader::StdWavHeader(quint32 dataSize, StdWavHeader::Quality quality)
-{
- mDataSize = dataSize;
-
- switch (quality)
- {
- case Quality_Stereo_CD:
- mNumChannels = 2;
- mBitsPerSample = 16;
- mSampleRate = 44100;
- break;
-
-
- case Quality_Stereo_24_96:
- mNumChannels = 2;
- mBitsPerSample = 24;
- mSampleRate = 96000;
- break;
-
- case Quality_Stereo_24_192:
- mNumChannels = 2;
- mBitsPerSample = 24;
- mSampleRate = 192000;
- break;
-
- }
-
- mDataStartPos = CANONICAL_HEADER_SIZE;
- mFileSize = mDataStartPos + mDataSize;
- mFormat = Format_PCM;
- mByteRate = mSampleRate * mNumChannels * mBitsPerSample / 8;
- mBlockAlign = mNumChannels * mBitsPerSample / 8;
-
-}
-
-
-/************************************************
- *
- ************************************************/
-quint32 StdWavHeader::bytesPerSecond(StdWavHeader::Quality quality)
-{
- switch (quality)
- {
- case Quality_Stereo_CD: return 2 * 16 * 44100 / 8;
- case Quality_Stereo_24_96: return 2 * 24 * 96000 / 8;
- case Quality_Stereo_24_192: return 2 * 24 * 192000 / 8;
- }
- return 0;
-}
-
-
-/************************************************
 * See WAV specoification
- * http://soundfile.sapp.org/doc/WaveFormat/
+ * http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/WAVE/WAVE.html
 * https://en.wikipedia.org/wiki/WAV
 ************************************************/
-void WavHeader::load(QIODevice *stream)
+WavHeader::WavHeader(QIODevice *stream):
+ mFormat(WavHeader::Format_Unknown),
+ mNumChannels(0),
+ mSampleRate(0),
+ mByteRate(0),
+ mBlockAlign(0),
+ mBitsPerSample(0),
+ mExtSize(0),
+ mValidBitsPerSample(0),
+ mChannelMask(0),
+ mDataSize(0),
+ mDataStartPos(0)
 {
 char tag[5] = { '\0' };
 // look for "RIFF" in header
@@ -309,24 +231,12 @@
 
 quint32 chunkSize = readUInt32(stream);
 pos+=8;
- //qDebug()<< QString("found chunk: [%1] with length %2").arg(chunkID.data()).arg(chunkSize);
 
 if (strcmp(chunkID, WAV_FMT) == 0)
 {
- pos+=chunkSize;
- if (chunkSize < 16)
- throw FlaconError("fmt chunk in WAVE header was too short");
-
- this->mFormat = static_cast<Format>(readUInt16(stream));
- this->mNumChannels = readUInt16(stream);
- this->mSampleRate = readUInt32(stream);
- this->mByteRate = readUInt32(stream);
- this->mBlockAlign = readUInt16(stream);
- this->mBitsPerSample = readUInt16(stream);
-
- if (chunkSize > 16)
- mustSkip(stream, chunkSize - 16);
+ loadFmtChunk(stream, chunkSize);
 
+ pos+=chunkSize;
 }
 
 else if (strcmp(chunkID, WAV_DATA) == 0)
@@ -338,8 +248,10 @@
 
 else
 {
+ mOtherCunks << chunkID;
+ mOtherCunks << chunkSize;
+ mOtherCunks.append(stream->read(chunkSize));
 pos+=chunkSize;
- mustSkip(stream, chunkSize);
 }
 }
 
@@ -350,50 +262,159 @@
 /************************************************
 *
 ************************************************/
-QByteArray& operator<<(QByteArray& out, const char val[4])
+WavHeader::WavHeader(const WavHeader &other)
 {
- out += val;
- return out;
+ this->operator=(other);
 }
 
 
 /************************************************
 *
 ************************************************/
-QByteArray& operator<<(QByteArray& out, quint32 val)
+WavHeader &WavHeader::operator=(const WavHeader &other)
 {
- union {
- quint32 n;
- char bytes[4];
- };
+ mFileSize = other.mFileSize;
+ mFmtSize = other.mFmtSize;
+ mFormat = other.mFormat;
+ mNumChannels = other.mNumChannels;
+ mSampleRate = other.mSampleRate;
+ mByteRate = other.mByteRate;
+ mBlockAlign = other.mBlockAlign;
+ mBitsPerSample = other.mBitsPerSample;
+ mExtSize = other.mExtSize;
+ mValidBitsPerSample = other.mValidBitsPerSample;
+ mChannelMask = other.mChannelMask;
+ mDataSize = other.mDataSize;
+ mDataStartPos = other.mDataStartPos;
+ mSubFormat = other.mSubFormat;
+ mOtherCunks = other.mOtherCunks;
+
+ return *this;
+}
 
- n = qToLittleEndian(val);
- out += bytes[0];
- out += bytes[1];
- out += bytes[2];
- out += bytes[3];
 
- return out;
+/************************************************
+ *
+ ************************************************/
+bool WavHeader::isCdQuality() const
+{
+ static const int CD_NUM_CHANNELS = 2;
+ static const int CD_BITS_PER_SAMPLE = 16;
+ static const int CD_SAMPLE_RATE = 44100;
+ static const int CD_BYTE_RATE = 176400;
+
+ return mNumChannels == CD_NUM_CHANNELS &&
+ mBitsPerSample == CD_BITS_PER_SAMPLE &&
+ mSampleRate == CD_SAMPLE_RATE &&
+ mByteRate == CD_BYTE_RATE;
 }
 
 
 /************************************************
 *
 ************************************************/
-QByteArray& operator<<(QByteArray& out, quint16 val)
+quint64 WavHeader::duration() const
 {
- union {
- quint32 n;
- char bytes[2];
- };
+ return (mDataSize * 1000ull) / mByteRate;
+}
 
- n = qToLittleEndian(val);
- out += bytes[0];
- out += bytes[1];
 
- return out;
+/************************************************
+ *
+ ************************************************/
+quint32 WavHeader::bytesPerSecond(WavHeader::Quality quality)
+{
+ switch (quality)
+ {
+ case Quality_Stereo_CD: return 2 * 16 * 44100 / 8;
+ case Quality_Stereo_24_96: return 2 * 24 * 96000 / 8;
+ case Quality_Stereo_24_192: return 2 * 24 * 192000 / 8;
+ }
+ return 0;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+quint32 WavHeader::bytesPerSecond()
+{
+ return mNumChannels * mBitsPerSample * mSampleRate / 8;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void checkFormat(quint16 format) {
+
+ switch (format) {
+ case WavHeader::Format_Unknown:
+ case WavHeader::Format_PCM:
+ case WavHeader::Format_ADPCM:
+ case WavHeader::Format_IEEE_FLOAT:
+ case WavHeader::Format_ALAW:
+ case WavHeader::Format_MULAW:
+ case WavHeader::Format_OKI_ADPCM:
+ case WavHeader::Format_IMA_ADPCM:
+ case WavHeader::Format_DIGISTD:
+ case WavHeader::Format_DIGIFIX:
+ case WavHeader::Format_DOLBY_AC2:
+ case WavHeader::Format_GSM610:
+ case WavHeader::Format_ROCKWELL_ADPCM:
+ case WavHeader::Format_ROCKWELL_DIGITALK:
+ case WavHeader::Format_G721_ADPCM:
+ case WavHeader::Format_G728_CELP:
+ case WavHeader::Format_MPEG:
+ case WavHeader::Format_MPEGLAYER3:
+ case WavHeader::Format_G726_ADPCM:
+ case WavHeader::Format_G722_ADPCM:
+ case WavHeader::Format_Extensible:
+ return;
+ }
+
+ throw FlaconError(QString("unknown format (%1) in WAVE header").arg(format, 0, 16));
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void WavHeader::loadFmtChunk(QIODevice *stream, const quint32 chunkSize)
+{
+ if (chunkSize != 16 && chunkSize != 18 && chunkSize != 40)
+ throw FlaconError("fmt chunk in WAVE header hase incorrect length");
+
+ mFmtSize = chunkSize;
+
+ quint16 format = readUInt16(stream);
+
+ this->mFormat = static_cast<Format>(format);
+ checkFormat(format);
+ this->mNumChannels = readUInt16(stream);
+ this->mSampleRate = readUInt32(stream);
+ this->mByteRate = readUInt32(stream);
+ this->mBlockAlign = readUInt16(stream);
+ this->mBitsPerSample = readUInt16(stream);
+
+ if (chunkSize == 16)
+ return;
+
+ mExtSize = readUInt16(stream); // Size of the extension:
+ if (chunkSize == 18)
+ return;
+
+ if (mExtSize != 22)
+ throw FlaconError("Size of the extension in WAVE header hase incorrect length");
+
+ mValidBitsPerSample = readUInt16(stream); // at most 8*M
+ mChannelMask = readUInt32(stream); // Speaker position mask
+ mSubFormat = stream->read(16); // GUID (first two bytes are the data format code)
 }
 
+
+
+
 /************************************************
 * 52 49 46 46 RIFF
 * 24 B9 4D 02 file size - 8
@@ -421,19 +442,43 @@
 res << WAV_WAVE;
 
 res << WAV_FMT;
- res << quint32(16);
+ res << mFmtSize;
 res << (quint16)(mFormat);
 res << mNumChannels;
 res << mSampleRate;
 res << mByteRate;
 res << mBlockAlign;
 res << mBitsPerSample;
+
+ if (mExtSize) {
+ res << mExtSize;
+ res << mValidBitsPerSample;
+ res << mChannelMask;
+ res.append(mSubFormat);
+ }
+
+ res.append(mOtherCunks);
+
 res << WAV_DATA;
 res << mDataSize;
 
 return res;
 }
 
+
+/************************************************
+ *
+ ************************************************/
+void WavHeader::resizeData(quint32 dataSize)
+{
+ mDataSize = dataSize;
+ mFileSize = mDataStartPos + mDataSize;
+}
+
+
+/************************************************
+ *
+ ************************************************/
 QDebug operator<<(QDebug dbg, const WavHeader &header)
 {
 QString format;
@@ -458,7 +503,8 @@
 case WavHeader::Format_MPEG: format = "MPEG"; break;
 case WavHeader::Format_MPEGLAYER3: format = "MPEGLAYER3"; break;
 case WavHeader::Format_G726_ADPCM: format = "G726_ADPCM"; break;
- case WavHeader::Format_G722_ADPCM: format = "Unknown"; break;
+ case WavHeader::Format_G722_ADPCM: format = "G722_ADPCM"; break;
+ case WavHeader::Format_Extensible: format = "Extensible"; break;
 }

flacon-5.4.0.tar.gz/converter/wavheader.h -> flacon-5.5.1.tar.gz/converter/wavheader.h Changed

@@ -29,7 +29,12 @@
 
 #include <QtGlobal>
 #include <QIODevice>
+#include <QTime>
 
+/************************************************
+ * Info for format tags can be found at:
+ * http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/WAVE/WAVE.html
+ ************************************************/
 class WavHeader {
 public:
 enum Format{
@@ -52,76 +57,71 @@
 Format_MPEG = 0x0050,
 Format_MPEGLAYER3 = 0x0055,
 Format_G726_ADPCM = 0x0064,
- Format_G722_ADPCM = 0x0065
+ Format_G722_ADPCM = 0x0065,
+ Format_Extensible = 0xFFFE,
+ };
+
+ enum Quality {
+ Quality_Stereo_CD = 2 * 16 * 44100,
+ Quality_Stereo_24_96 = 2 * 24 * 96000,
+ Quality_Stereo_24_192 = 2 * 24 * 192000
 
 };
 
+ typedef char SubFormat[16];
 
 WavHeader();
+ explicit WavHeader(QIODevice* stream);
 
- 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;
+ WavHeader(const WavHeader &other);
+ WavHeader &operator=(const WavHeader &other);
 
 /// Duration of audio in milliseconds.
 quint64 duration() const;
 
- void load(QIODevice* stream);
-
 QByteArray toByteArray() const;
 
+ void resizeData(quint32 dataSize);
+
+ static quint32 bytesPerSecond(Quality quality);
+ quint32 bytesPerSecond();
+
+ 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; }
+ quint16 validBitsPerSample() const { return mValidBitsPerSample; }
+ quint32 channelMask() const { return mChannelMask; }
+ quint32 dataSize() const { return mDataSize; }
+ quint32 dataStartPos() const { return mDataStartPos; }
+ bool isCdQuality() const;
+
+
 protected:
 quint32 mFileSize;
+ quint32 mFmtSize;
 Format mFormat;
 quint16 mNumChannels;
 quint32 mSampleRate;
 quint32 mByteRate;
 quint16 mBlockAlign;
 quint16 mBitsPerSample;
+ quint16 mExtSize; // Size of the extension:
+ quint16 mValidBitsPerSample; // at most 8*M
+ quint32 mChannelMask; // Speaker position mask
+ QByteArray mSubFormat; // GUID (first two bytes are the data format code)
 quint32 mDataSize;
 quint32 mDataStartPos;
 
-private:
+ QByteArray mOtherCunks;
 
+private:
+ void loadFmtChunk(QIODevice* stream, const quint32 chunkSize);
 };
 
 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-5.4.0.tar.gz/converter/worker.h -> flacon-5.5.1.tar.gz/converter/worker.h Changed

flacon-5.4.0.tar.gz/disk.cpp -> flacon-5.5.1.tar.gz/disk.cpp Changed

flacon-5.4.0.tar.gz/disk.h -> flacon-5.5.1.tar.gz/disk.h Changed

flacon-5.4.0.tar.gz/formats/aac.h -> flacon-5.5.1.tar.gz/formats/aac.h Changed

flacon-5.4.0.tar.gz/formats/flac.h -> flacon-5.5.1.tar.gz/formats/flac.h Changed

flacon-5.4.0.tar.gz/formats/format.cpp -> flacon-5.5.1.tar.gz/formats/format.cpp Changed

flacon-5.4.0.tar.gz/formats/mp3.h -> flacon-5.5.1.tar.gz/formats/mp3.h Changed

flacon-5.4.0.tar.gz/formats/ogg.h -> flacon-5.5.1.tar.gz/formats/ogg.h Changed

flacon-5.4.0.tar.gz/formats/opus.h -> flacon-5.5.1.tar.gz/formats/opus.h Changed

flacon-5.4.0.tar.gz/formats/outformat.h -> flacon-5.5.1.tar.gz/formats/outformat.h Changed

flacon-5.4.0.tar.gz/formats/wav.h -> flacon-5.5.1.tar.gz/formats/wav.h Changed

flacon-5.4.0.tar.gz/formats/wv.h -> flacon-5.5.1.tar.gz/formats/wv.h Changed

flacon-5.4.0.tar.gz/gui/aboutdialog/aboutdialog.cpp -> flacon-5.5.1.tar.gz/gui/aboutdialog/aboutdialog.cpp Changed

flacon-5.4.0.tar.gz/gui/aboutdialog/aboutdialog.h -> flacon-5.5.1.tar.gz/gui/aboutdialog/aboutdialog.h Changed

flacon-5.4.0.tar.gz/gui/configdialog/configdialog.cpp -> flacon-5.5.1.tar.gz/gui/configdialog/configdialog.cpp Changed

@@ -98,30 +98,19 @@
 
     this->setMinimumSize(this->size());
 
-    int width = settings->value(Settings::ConfigureDialog_Width).toInt();
-    int height = settings->value(Settings::ConfigureDialog_Height).toInt();
-    resize(width, height);
-
-
     generalPage->setWindowTitle(tr("General configuration"));
     programsPage->setWindowTitle(tr("Full path of the external applications"));
 
     connect(pages, SIGNAL(currentChanged(int)), this, SLOT(setPage(int)));
 
     initGeneralPage();
-    initTabPages();
+    int width = settings->value(Settings::ConfigureDialog_Width).toInt();
+    int height = settings->value(Settings::ConfigureDialog_Height).toInt();
+    resize(width, height);
 
-#ifdef MAC_BUNDLE
-    pages->removeTab(pages->indexOf(programsPage));
-#else
+    initFormatPages();
     initPrograms();
-#endif
-
-#ifdef MAC_UPDATER
     initUpdatePage();
-#else
-    pages->removeTab(pages->indexOf(updatePage));
-#endif
 
     pages->setCurrentIndex(0);
     load();
@@ -173,6 +162,12 @@
  ************************************************/
 void ConfigDialog::initGeneralPage()
 {
+#ifdef FLATPAK_BUNDLE
+    tmpDirLabel->hide();
+    tmpDirEdit->hide();
+    tmpDirButton->hide();
+#endif
+
     tmpDirButton->setIcon(Icon("folder"));
     connect(tmpDirButton, SIGNAL(clicked()), this, SLOT(tmpDirShowDialog()));
 
@@ -202,7 +197,7 @@
 /************************************************
 
  ************************************************/
-void ConfigDialog::initTabPages()
+void ConfigDialog::initFormatPages()
 {
     int n = 1;
     foreach(OutFormat *format, OutFormat::allFormats())
@@ -223,6 +218,12 @@
 /************************************************
 
  ************************************************/
+#if defined(MAC_BUNDLE) || defined(FLATPAK_BUNDLE)
+void ConfigDialog::initPrograms()
+{
+    pages->removeTab(pages->indexOf(programsPage));
+}
+#else
 void ConfigDialog::initPrograms()
 {
     QStringList progs = QStringList::fromSet(settings->programs());
@@ -242,14 +243,14 @@
         row++;
     }
 }
-
+#endif
 
 /************************************************
  *
  ************************************************/
+#ifdef MAC_UPDATER
 void ConfigDialog::initUpdatePage()
 {
-#ifdef MAC_UPDATER
     connect(updateNowBtn, &QPushButton::clicked,
             [this]() {
                 Updater::sharedUpdater().checkForUpdatesInBackground();
@@ -257,10 +258,13 @@
             });
 
     updateLastUpdateLbl();
-
-#endif
 }
-
+#else
+void ConfigDialog::initUpdatePage()
+{
+    pages->removeTab(pages->indexOf(updatePage));
+}
+#endif
 
 /************************************************
 
@@ -409,7 +413,6 @@
 {
     EncoderConfigPage::loadWidget("Tags/DefaultCodepage",  codePageComboBox);
     EncoderConfigPage::loadWidget("Encoder/ThreadCount",   threadsCountSpin);
-    EncoderConfigPage::loadWidget("Encoder/TmpDir",        tmpDirEdit);
     EncoderConfigPage::loadWidget("PerTrackCue/Create",    perTrackCueCheck);
     EncoderConfigPage::loadWidget("PerTrackCue/Pregap",    preGapComboBox);
     perTrackCueFormatEdit->setEditText(settings->value(Settings::PerTrackCue_FileName).toString());
@@ -427,7 +430,11 @@
         edit->setText(settings->value("Programs/" + edit->programName()).toString());
 
 #ifdef MAC_UPDATER
-   autoUpdateCbk->setChecked(Updater::sharedUpdater().automaticallyChecksForUpdates());
+    autoUpdateCbk->setChecked(Updater::sharedUpdater().automaticallyChecksForUpdates());
+#endif
+
+#ifndef FLATPAK_BUNDLE
+    EncoderConfigPage::loadWidget("Encoder/TmpDir",        tmpDirEdit);
 #endif
 }
 
@@ -439,7 +446,6 @@
 {
     EncoderConfigPage::writeWidget("Tags/DefaultCodepage",  codePageComboBox);
     EncoderConfigPage::writeWidget("Encoder/ThreadCount",   threadsCountSpin);
-    EncoderConfigPage::writeWidget("Encoder/TmpDir",        tmpDirEdit);
     EncoderConfigPage::writeWidget("PerTrackCue/Create",    perTrackCueCheck);
     EncoderConfigPage::writeWidget("PerTrackCue/Pregap",    preGapComboBox);
 
@@ -461,6 +467,10 @@
     Updater::sharedUpdater().setAutomaticallyChecksForUpdates(
         autoUpdateCbk->isChecked());
 #endif
+
+#ifndef FLATPAK_BUNDLE
+    EncoderConfigPage::writeWidget("Encoder/TmpDir",        tmpDirEdit);
+#endif
 }

flacon-5.4.0.tar.gz/gui/configdialog/configdialog.h -> flacon-5.5.1.tar.gz/gui/configdialog/configdialog.h Changed

flacon-5.4.0.tar.gz/gui/configdialog/configdialog.ui -> flacon-5.5.1.tar.gz/gui/configdialog/configdialog.ui Changed

flacon-5.4.0.tar.gz/gui/controls.h -> flacon-5.5.1.tar.gz/gui/controls.h Changed

@@ -53,7 +53,7 @@
 {
     Q_OBJECT
 public:
-    explicit OutPatternButton(QWidget * parent=0);
+    explicit OutPatternButton(QWidget * parent = nullptr);
     void addPattern(const QString &pattern, const QString &title);
     void addFullPattern(const QString &pattern, const QString &title);
 
@@ -82,7 +82,7 @@
 {
     Q_OBJECT
 public:
-    explicit ActionsButton(QWidget * parent=0);
+    explicit ActionsButton(QWidget * parent = nullptr);
     QMenu *menu()  { return &mMenu; }
 
 private slots:
@@ -101,7 +101,7 @@
 {
     Q_OBJECT
 public:
-    explicit MultiValuesSpinBox(QWidget *parent = 0);
+    explicit MultiValuesSpinBox(QWidget *parent = nullptr);
     bool multi() const { return mMultiState == MultiValuesMulti; }
     void stepBy(int steps);
 
@@ -127,7 +127,7 @@
 {
     Q_OBJECT
 public:
-    explicit MultiValuesLineEdit(QWidget *parent = 0);
+    explicit MultiValuesLineEdit(QWidget *parent = nullptr);
 
 
 public slots:
@@ -146,7 +146,7 @@
 {
     Q_OBJECT
 public:
-    explicit MultiValuesTextEdit(QWidget *parent = 0);
+    explicit MultiValuesTextEdit(QWidget *parent = nullptr);
 
     bool isModified() const;
     QString text() const { return this->toPlainText(); }
@@ -166,7 +166,7 @@
 {
     Q_OBJECT
 public:
-    explicit TagTextEdit(QWidget *parent = 0);
+    explicit TagTextEdit(QWidget *parent = nullptr);
 
     TagId tagId() const { return mTagId; }
     void setTagId(TagId tagId) { mTagId = tagId; }
@@ -183,7 +183,7 @@
 {
     Q_OBJECT
 public:
-    explicit TagLineEdit(QWidget *parent = 0);
+    explicit TagLineEdit(QWidget *parent = nullptr);
 
     TagId tagId() const { return mTagId; }
     void setTagId(TagId tagId) { mTagId = tagId; }
@@ -200,7 +200,7 @@
 {
     Q_OBJECT
 public:
-    explicit TagSpinBox(QWidget *parent = 0);
+    explicit TagSpinBox(QWidget *parent = nullptr);
 
     TagId tagId() const { return mTagId; }
     void setTagId(TagId tagId) { mTagId = tagId; }
@@ -217,7 +217,7 @@
 {
     Q_OBJECT
 public:
-    explicit MultiValuesComboBox(QWidget *parent = 0);
+    explicit MultiValuesComboBox(QWidget *parent = nullptr);
     bool multi() const { return mMultiState == MultiValuesMulti; }
 
 public slots:
@@ -236,7 +236,7 @@
 {
     Q_OBJECT
 public:
-    explicit CodePageComboBox(QWidget *parent = 0);
+    explicit CodePageComboBox(QWidget *parent = nullptr);
 
 private:
     void addCodecName(const QString &title, const QString &codecName);
@@ -260,7 +260,7 @@
 {
     Q_OBJECT
 public:
-    ProgramEdit(const QString &programName, QWidget *parent = 0);
+    ProgramEdit(const QString &programName, QWidget *parent = nullptr);
 
     QString programName() const { return mProgramName;}
 
@@ -287,7 +287,7 @@
 {
     Q_OBJECT
 public:
-    explicit HistoryComboBox(QWidget *parent = 0);
+    explicit HistoryComboBox(QWidget *parent = nullptr);
     QStringList history() const;
     void setHistory(const QStringList &value);
 
@@ -311,7 +311,7 @@
 {
     Q_OBJECT
 public:
-    explicit OutDirComboBox(QWidget *parent = 0);
+    explicit OutDirComboBox(QWidget *parent = nullptr);
 };
 
 
@@ -323,7 +323,7 @@
 {
     Q_OBJECT
 public:
-    explicit ErrorBox(QWidget *parent = 0);
+    explicit ErrorBox(QWidget *parent = nullptr);
 
     QStringList messages() const { return mMessgaes; }
     void setMessages(const QStringList &messages);

flacon-5.4.0.tar.gz/gui/coverdialog/asynclistwidgetitem.cpp -> flacon-5.5.1.tar.gz/gui/coverdialog/asynclistwidgetitem.cpp Changed

flacon-5.4.0.tar.gz/gui/coverdialog/coverdialog.h -> flacon-5.5.1.tar.gz/gui/coverdialog/coverdialog.h Changed

flacon-5.4.0.tar.gz/gui/cuediskselectdialog/cuediskselectdialog.h -> flacon-5.5.1.tar.gz/gui/cuediskselectdialog/cuediskselectdialog.h Changed

flacon-5.4.0.tar.gz/gui/mainwindow.cpp -> flacon-5.5.1.tar.gz/gui/mainwindow.cpp Changed

flacon-5.4.0.tar.gz/gui/mainwindow.h -> flacon-5.5.1.tar.gz/gui/mainwindow.h Changed

flacon-5.4.0.tar.gz/gui/tageditor/tageditor.cpp -> flacon-5.5.1.tar.gz/gui/tageditor/tageditor.cpp Changed

flacon-5.4.0.tar.gz/gui/tageditor/tageditor.h -> flacon-5.5.1.tar.gz/gui/tageditor/tageditor.h Changed

flacon-5.4.0.tar.gz/gui/trackview.cpp -> flacon-5.5.1.tar.gz/gui/trackview.cpp Changed

flacon-5.4.0.tar.gz/gui/trackview.h -> flacon-5.5.1.tar.gz/gui/trackview.h Changed

flacon-5.4.0.tar.gz/gui/trackviewdelegate.cpp -> flacon-5.5.1.tar.gz/gui/trackviewdelegate.cpp Changed

flacon-5.4.0.tar.gz/gui/trackviewmodel.cpp -> flacon-5.5.1.tar.gz/gui/trackviewmodel.cpp Changed

@@ -98,7 +98,7 @@
 if (mDiskId && mDiskId-1 < project->count())
 return project->disk(mDiskId - 1);
 
- return NULL;
+ return nullptr;
 }
 
 Track *track() const
@@ -109,7 +109,7 @@
 if (disk && mTrackId -1 < disk->count())
 return disk->track(mTrackId - 1);
 }
- return NULL;
+ return nullptr;
 }
 
 private:
@@ -139,6 +139,9 @@
 
 connect(project, SIGNAL(layoutChanged()), this, SIGNAL(layoutChanged()));
 connect(project, SIGNAL(afterRemoveDisk()), this, SIGNAL(layoutChanged()));
+
+ connect(project, &Project::beforeRemoveDisk,
+ this, &TrackViewModel::invalidateCache);
 }
 
 
@@ -619,10 +622,10 @@
 /************************************************
 
 ************************************************/
-//void TrackViewModel::trackDataChanged(int disk, int track)
-//{
-// QModelIndex diskIndex = index(disk, 0, QModelIndex());
-// QModelIndex index1 = index(track, 0, diskIndex);
-// QModelIndex index2 = index(track, TrackView::ColumnCount, diskIndex);
-// emit dataChanged(index1, index2);
-//}
+void TrackViewModel::invalidateCache(const Disk *disk)
+{
+ mCache->downloadedDisks.remove(index(*disk).row());
+
+ for (int i=0; i<disk->count(); ++i)
+ mCache->tracks.remove(*(disk->track(i)));
+}

flacon-5.4.0.tar.gz/gui/trackviewmodel.h -> flacon-5.5.1.tar.gz/gui/trackviewmodel.h Changed

flacon-5.4.0.tar.gz/inputaudiofile.cpp -> flacon-5.5.1.tar.gz/inputaudiofile.cpp Changed

flacon-5.4.0.tar.gz/main.cpp -> flacon-5.5.1.tar.gz/main.cpp Changed

flacon-5.4.0.tar.gz/misc/Info.plist.in -> flacon-5.5.1.tar.gz/misc/Info.plist.in Changed

flacon-5.5.1.tar.gz/misc/com.github.Flacon.metadata.xml.in Added

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<component type="desktop-application">
+ <id>com.github.Flacon</id>
+ <name>Flacon</name>
+ <summary>Flacon extracts individual tracks from one big audio file containing the entire album of music and saves them as separate audio files</summary>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>LGPL-3.0</project_license>
+
+ <developer_name>Flacon team</developer_name>
+ <update_contact>sokoloff.a@gmail.com</update_contact>
+
+ <url type="homepage">https://flacon.github.io/</url>
+ <url type="bugtracker">https://github.com/flacon/flacon</url>
+ <url type="help">https://github.com/flacon/flacon/wiki</url>
+ <url type="donation">https://flacon.github.io/donate/</url>
+
+ <launchable type="desktop-id">io.github.Flacon.desktop</launchable>
+
+ <description>
+ Flacon extracts individual tracks from one big audio file containing the entire album of music and saves them as separate audio files. To do this, it uses information from the appropriate CUE file. Besides, Flacon makes it possible to conveniently revise or specify tags both for all tracks at once or for each tag separately.
+ 
+ <ul>
+ <li>Supported input formats: WAV, FLAC, APE, WavPack, True Audio (TTA)</li>
+ <li>Supported out formats: FLAC, WAV, WavPack, AAC, OGG or MP3.</li>
+ <li>Replay Gain analysis (album-gain and track-gain modes)</li>
+ <li>Multi-threaded conversion process.</li>
+ <li>Automatic character set detection for CUE files</li>
+ <li>Generation of the pertrack CUE file in the output dir</li>
+ </ul>
+ </description>
+
+ <screenshots>
+ <screenshot type="default">
+ <image>https://flacon.github.io/screenshots/flacon-main.png</image>
+ <caption>Main view</caption>
+ </screenshot>
+ </screenshots>
+
+ <releases>
+ <release version="@FLACON_VERSION@" date="@BUILD_DATE@" />
+ </releases>
+
+ <content_rating type="oars-1.1">
+ </content_rating>
+</component>
+
+

flacon-5.4.0.tar.gz/project.cpp -> flacon-5.5.1.tar.gz/project.cpp Changed

flacon-5.4.0.tar.gz/project.h -> flacon-5.5.1.tar.gz/project.h Changed

flacon-5.4.0.tar.gz/scanner.cpp -> flacon-5.5.1.tar.gz/scanner.cpp Changed

flacon-5.4.0.tar.gz/scanner.h -> flacon-5.5.1.tar.gz/scanner.h Changed

flacon-5.4.0.tar.gz/scripts/checkLicense.sh -> flacon-5.5.1.tar.gz/scripts/checkLicense.sh Changed

flacon-5.4.0.tar.gz/settings.cpp -> flacon-5.5.1.tar.gz/settings.cpp Changed

flacon-5.5.1.tar.gz/tests/data/24x96.wav.hdr Added

flacon-5.5.1.tar.gz/tests/data/CD.wav.hdr Added

flacon-5.4.0.tar.gz/tests/data/testConvert/01 with pregap and HTOA, without cue/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/01 with pregap and HTOA, without cue/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/02 with pregap and HTOA, with cue/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/02 with pregap and HTOA, with cue/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/03 Without pregap, without HTOA/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/03 Without pregap, without HTOA/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/04 Without pregap, without HTOA/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/04 Without pregap, without HTOA/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/05 With pregap, without HTOA/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/05 With pregap, without HTOA/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/06 All tags/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/06 All tags/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/07 Garbage in the CUE/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/07 Garbage in the CUE/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/08 path with symbols and space/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/08 path with symbols and space/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/09 Russian/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/09 Russian/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/10 Multi/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/10 Multi/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/11 Temporary dir/flacon.conf -> flacon-5.5.1.tar.gz/tests/data/testConvert/11 Temporary dir/flacon.conf Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/11 Temporary dir/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/11 Temporary dir/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/12.1 AlbumGain without pregap/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/12.1 AlbumGain without pregap/spec.ini Changed

flacon-5.4.0.tar.gz/tests/data/testConvert/12.2 AlbumGain with pregap/spec.ini -> flacon-5.5.1.tar.gz/tests/data/testConvert/12.2 AlbumGain with pregap/spec.ini Changed

flacon-5.5.1.tar.gz/tests/data/testConvert/13.1 issue_100_0100 Added

flacon-5.5.1.tar.gz/tests/data/testConvert/13.1 issue_100_0100/24x96_0100.wav.hdr Added

flacon-5.5.1.tar.gz/tests/data/testConvert/13.1 issue_100_0100/flacon.conf Added

flacon-5.5.1.tar.gz/tests/data/testConvert/13.1 issue_100_0100/source.cue Added

flacon-5.5.1.tar.gz/tests/data/testConvert/13.1 issue_100_0100/spec.ini Added

flacon-5.5.1.tar.gz/tests/data/testConvert/13.2 issue_100_FEFF Added

flacon-5.5.1.tar.gz/tests/data/testConvert/13.2 issue_100_FEFF/24x96_FEFF.wav.hdr Added

flacon-5.5.1.tar.gz/tests/data/testConvert/13.2 issue_100_FEFF/flacon.conf Added

flacon-5.5.1.tar.gz/tests/data/testConvert/13.2 issue_100_FEFF/source.cue Added

flacon-5.5.1.tar.gz/tests/data/testConvert/13.2 issue_100_FEFF/spec.ini Added

flacon-5.4.0.tar.gz/tests/inittestcase.cpp -> flacon-5.5.1.tar.gz/tests/inittestcase.cpp Changed

@@ -91,7 +91,13 @@
     mAudio_cd_wv   = mTmpDir + "CD.wv";
     mAudio_cd_tta  = mTmpDir + "CD.tta";
 
-    createWavFile(  mAudio_cd_wav,  900, StdWavHeader::Quality_Stereo_CD);
+    {
+        QFile hdr(TEST_DATA_DIR "CD.wav.hdr");
+        if (!hdr.open(QFile::ReadOnly))
+            QTest::qFail(QString("Can't open header file '%1': %2").arg(hdr.fileName()).arg(hdr.errorString()).toLocal8Bit(), __FILE__, __LINE__);
+
+        createWavFile(mAudio_cd_wav, hdr.readAll(), 900);
+    }
     auto wait_cd_ape  = QtConcurrent::run(encodeAudioFile, mAudio_cd_wav, mAudio_cd_ape);
     auto wait_cd_flac = QtConcurrent::run(encodeAudioFile, mAudio_cd_wav, mAudio_cd_flac);
     auto wait_cd_wv   = QtConcurrent::run(encodeAudioFile, mAudio_cd_wav, mAudio_cd_wv);
@@ -104,7 +110,14 @@
     mAudio_24x96_wv   = mTmpDir + "24x96.wv";
     mAudio_24x96_tta  = mTmpDir + "24x96.tta";
 
-    createWavFile(  mAudio_24x96_wav,  900, StdWavHeader::Quality_Stereo_24_96);
+
+    {
+        QFile hdr(TEST_DATA_DIR "24x96.wav.hdr");
+        if (!hdr.open(QFile::ReadOnly))
+            QTest::qFail(QString("Can't open header file '%1': %2").arg(hdr.fileName()).arg(hdr.errorString()).toLocal8Bit(), __FILE__, __LINE__);
+
+        createWavFile(mAudio_24x96_wav, hdr.readAll(), 900);
+    }
     auto wait_24x96_ape  = QtConcurrent::run(encodeAudioFile, mAudio_24x96_wav, mAudio_24x96_ape);
     auto wait_24x96_flac = QtConcurrent::run(encodeAudioFile, mAudio_24x96_wav, mAudio_24x96_flac);
     auto wait_24x96_wv   = QtConcurrent::run(encodeAudioFile, mAudio_24x96_wav, mAudio_24x96_wv);

flacon-5.4.0.tar.gz/tests/test_convert.cpp -> flacon-5.5.1.tar.gz/tests/test_convert.cpp Changed

@@ -82,18 +82,32 @@
 // ..........................................
 
 
- // Copy source audio files ..................
- spec.beginGroup("Source_Audio");
- foreach (auto key, spec.allKeys())
- {
- QString src = mTmpDir + "/" + key;
- QString dest = inDir + "/" + spec.value(key).toString();
+ // Prepare source audio files ...............
+ for (QString group: spec.childGroups()) {
+ if (!group.toUpper().startsWith("SOURCE_AUDIO"))
+ continue;
 
+ spec.beginGroup(group);
+ QString dest = inDir + "/" + spec.value("destination").toString();
 QFileInfo(dest).dir().mkpath(".");
- if (!QFile::copy(src, dest))
- QFAIL(QString("Can't copy audio file \"%1\"").arg(src).toLocal8Bit());
+
+ QString method = spec.value("method", "copy").toString().toLower();
+
+ // Copy audio file ......................
+ if ( method == "copy") {
+ QString src = mTmpDir + "/" + spec.value("source").toString();;
+
+ if (!QFile::copy(src, dest))
+ QFAIL(QString("Can't copy audio file \"%1\"").arg(src).toLocal8Bit());
+ }
+
+ // Generate file ........................
+ if (method == "generate") {
+ QString header = dataDir + "/" + spec.value("header").toString();
+ createWavFile(dest, readFile(header).join("\n"));
+ }
+ spec.endGroup();
 }
- spec.endGroup();
 // ..........................................
 
 // Copy source CUE files ....................
@@ -146,11 +160,14 @@
 QProcess proc;
 proc.start(flacon, args);
 if (!proc.waitForFinished(30 * 1000))
- QFAIL("The program timed out waiting for the result.");
+ {
+ QFAIL(QString("The program timed out waiting for the result: %1.")
+ .arg(QString::fromLocal8Bit(proc.readAllStandardError())).toLocal8Bit());
+ }
 
 if (proc.exitCode() != 0)
 {
- QFAIL(QString("Can't start converter: \"%1\"")
+ QFAIL(QString("Can't start converter: %1")
 .arg(QString::fromLocal8Bit(proc.readAllStandardError())).toLocal8Bit());
 }
 // ..........................................
@@ -228,15 +245,18 @@
 void TestFlacon::testConvert_data()
 {
 if (QProcessEnvironment::systemEnvironment().contains("FLACON_SKIP_CONVERT_TEST"))
- QSKIP("Skipping testConvert");
+ QTest::qSkip("Skipping testConvert", __FILE__, __LINE__);
 
- QTest::addColumn<QString>("dataDir");
+
+ QTest::addColumn<QString>("dataDir", nullptr);
 
 QString dataDir = mDataDir + "/testConvert/";
 
- foreach (auto dir, QDir(dataDir).entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name))
+ static const QStringList mask("*");
+ foreach (auto dir, QDir(dataDir).entryList(mask, QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name))
 {
 if (QDir(dataDir + "/" + dir).exists("spec.ini"))
 QTest::newRow(dir.toUtf8()) << dataDir + "/" + dir;
 }
 }
+

flacon-5.4.0.tar.gz/tests/test_cuereader.cpp -> flacon-5.5.1.tar.gz/tests/test_cuereader.cpp Changed

flacon-5.4.0.tar.gz/tests/test_decoder.cpp -> flacon-5.5.1.tar.gz/tests/test_decoder.cpp Changed

flacon-5.4.0.tar.gz/tests/test_findaudiofile.cpp -> flacon-5.5.1.tar.gz/tests/test_findaudiofile.cpp Changed

flacon-5.4.0.tar.gz/tests/test_findcuefile.cpp -> flacon-5.5.1.tar.gz/tests/test_findcuefile.cpp Changed

flacon-5.4.0.tar.gz/tests/test_format.cpp -> flacon-5.5.1.tar.gz/tests/test_format.cpp Changed

flacon-5.4.0.tar.gz/tests/test_inputaudiofile.cpp -> flacon-5.5.1.tar.gz/tests/test_inputaudiofile.cpp Changed

@@ -27,9 +27,7 @@
 #include "testflacon.h"
 #include "tools.h"
 #include "../formats/format.h"
-//#include "../formats/wav.h"
-//#include "../formats/flac.h"
-//#include "../settings.h"
+#include "types.h"
 #include "../inputaudiofile.h"
 
 #include <QTest>
@@ -46,24 +44,30 @@
 
 uint dur = duration.toInt();
 
-
- InputAudioFile ia(fileName);
- if (!ia.isValid())
+ try
 {
- FAIL(QString("Can't open '%1': %2").arg(fileName, ia.errorString()));
- return;
+ 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);
+ }
+ catch (FlaconError &err)
+ {
+ FAIL(err.what());
 }
-
- 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::addColumn<QString>("fileName", nullptr);
+ QTest::addColumn<QString>("duration", nullptr);
+ QTest::addColumn<QString>("format", nullptr);
 
 QTest::newRow("01 mAudio_cd_ape")
 << mAudio_cd_ape

flacon-5.4.0.tar.gz/tests/test_outformatencoderargs.cpp -> flacon-5.5.1.tar.gz/tests/test_outformatencoderargs.cpp Changed

flacon-5.4.0.tar.gz/tests/test_patternexpander.cpp -> flacon-5.5.1.tar.gz/tests/test_patternexpander.cpp Changed

flacon-5.4.0.tar.gz/tests/test_searchcoverimage.cpp -> flacon-5.5.1.tar.gz/tests/test_searchcoverimage.cpp Changed

flacon-5.4.0.tar.gz/tests/test_wavheader.cpp -> flacon-5.5.1.tar.gz/tests/test_wavheader.cpp Changed

@@ -27,9 +27,10 @@
 #include "../converter/wavheader.h"
 #include "testflacon.h"
 #include "tools.h"
+#include "types.h"
 #include <QTest>
 #include <QString>
-#include<QBuffer>
+#include <QBuffer>
 
 
 /************************************************
@@ -42,31 +43,42 @@
 QFETCH(QString, data_size);
 QFETCH(QString, duration);
 
- quint32 fileSize = file_size.toLongLong();
- quint32 dataSize = data_size.toLongLong();
- quint64 uduration = duration.toLongLong();
+ quint32 expectedFileSize = file_size.toLongLong();
+ quint32 expectedDataSize = data_size.toLongLong();
+ QTime expectedDuration = QTime::fromString(duration, "hh:mm:ss.zzz");
 
 try
 {
 QBuffer data;
 data.open(QBuffer::ReadWrite);
 writeHexString(testdata, &data);
+
 data.seek(0);
+ WavHeader header(&data);
+
+ QCOMPARE(header.toByteArray().toHex(), data.buffer().toHex());
 
+ QCOMPARE(header.fileSize(), expectedFileSize);
+ QCOMPARE(header.dataSize(), expectedDataSize);
+ QCOMPARE(QTime::fromMSecsSinceStartOfDay(header.duration()), expectedDuration);
 
- WavHeader header;
- header.load(&data);
+ // Test copy operator
+ WavHeader copyOperator = header;
+ QCOMPARE(copyOperator.toByteArray().toHex(), data.buffer().toHex());
 
- QCOMPARE(header.fileSize(), fileSize);
- QCOMPARE(header.dataSize(), dataSize);
- QCOMPARE(header.duration(), uduration);
+
+ // Test copy constructor
+ WavHeader copyConstructor(header);
+ QCOMPARE(copyConstructor.toByteArray().toHex(), data.buffer().toHex());
+ }
+ catch (FlaconError &err)
+ {
+ FAIL(err.what());
 }
 catch (char const *err)
 {
 QFAIL(err);
 }
-
-
 }
 
 
@@ -75,53 +87,53 @@
 ************************************************/
 void TestFlacon::testReadWavHeader_data()
 {
- QTest::addColumn<QString>("testdata");
- QTest::addColumn<QString>("file_size");
- QTest::addColumn<QString>("data_size");
- QTest::addColumn<QString>("duration");
+ QTest::addColumn<QString>("testdata", nullptr);
+ QTest::addColumn<QString>("file_size", nullptr);
+ QTest::addColumn<QString>("data_size", nullptr);
+ QTest::addColumn<QString>("duration", nullptr);
+
 
 QTest::newRow("01") <<
- "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
+ "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
+
+ << "38648108" // file size
+ << "38648064" // data size
+ << "00:03:39.093" // duration
 ;
 
 
 QTest::newRow("02") <<
- "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
+ "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"
@@ -130,41 +142,208 @@
 "31 2E 31 30"
 "30 00 "
 
- "64 61 74 61" // data
- "00 B9 4D 02" // data size
- "00"
+ "64 61 74 61" // data
+ "00 B9 4D 02" // data size
 
- << "38648142" // file size
- << "38648064" // data size
- << "219093" // duration 3 min 39 s 93 ms
+ << "38648142" // file size
+ << "38648064" // data size
+ << "00:03:39.093" // duration
 ;
 
 
 QTest::newRow("03") <<
- "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
+ "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
+ << "00:40:48.704" // duration
+ ;
+
+
+ QTest::newRow("04") <<
+ "52 49 46 46" // RIFF
+ "D0 9B 9B AF" // file size - 8
+ "57 41 56 45" // WAVE
+
+ "66 6D 74 20" // "fmt "
+ "28 00 00 00" // Chunk size 40
+ "FE FF" // AudioFormat
+ "02 00" // NumChannels
+
+ "00 77 01 00" // mSampleRate
+ "00 CA 08 00" // mByteRate
+ "06 00" // mBlockAlign
+ "18 00" // mBitsPerSample
+
+ "16 00" // Size of the extension
+ "18 00" // Number of valid bits
+ "03 00 00 00" // Speaker position mask
+ "01 00 00 00" // GUID, including the data format code
+ "00 00 10 00" //
+ "80 00 00 AA" //
+ "00 38 9B 71" //
+
+ "64 61 74 61" // data
+ "94 9B 9B AF" // data size
+
+ << "2946210776" // file size
+ << "2946210708" // data size
+ << "01:25:14.949" // duration
 ;
 
+ QTest::newRow("05") <<
+ "52 49 46 46" // RIFF
+ "D0 9B 9B AF" // file size - 8
+ "57 41 56 45" // WAVE
+
+ "66 6D 74 20" // "fmt "
+ "28 00 00 00" // Chunk size 40
+ "FE FF" // AudioFormat
+ "02 00" // NumChannels
+
+ "00 77 01 00" // mSampleRate
+ "00 CA 08 00" // mByteRate
+ "06 00" // mBlockAlign
+ "18 00" // mBitsPerSample
+
+ "16 00" // Size of the extension
+ "18 00" // Number of valid bits
+ "03 00 00 00" // Speaker position mask
+ "01 00 00 00" // GUID, including the data format code
+ "00 00 10 00" //
+ "80 00 00 AA" //
+ "00 38 9B 71" //
+
+ "64 61 74 61" // data
+ "94 9B 9B AF" // data size
+
+ << "2946210776" // file size
+ << "2946210708" // data size
+ << "01:25:14.949" // duration
+ ;
+
+ QTest::newRow("05") <<
+ "52 49 46 46"
+ "2A DF 02 00"
+ "57 41 56 45"
+
+ "66 6D 74 20" // Chunk ID
+ "28 00 00 00" // Chunk size
+ "FE FF" //Format code
+ "02 00"
+ "40 1F 00 00"
+ "00 FA 00 00"
+ "08 00"
+ "20 00"
+ "16 00" // Size of the extension
+ "20 00" // Number of valid bits
+ "03 00 00 00" // Speaker position mask
+ "03 00 00 00" // GUID, including the data format code
+ "00 00 10 00"
+ "80 00 00 AA"
+ "00 38 9B 71"
+
+ "66 61 63 74" // fact chunk
+ "04 00 00 00" // Chunk size
+ "C5 5B 00 00"
+
+ "64 61 74 61" // data chunk
+ "28 DE 02 00" // Chunk size
+
+ << "188210" // file size
+ << "187944" // data size
+ << "00:00:02.936"; // duration
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testResizeWavHeader()
+{
+ QFETCH(QString, header);
+ QFETCH(QString, dataSize);
+ QFETCH(QString, expectedChunkSize);
+ QFETCH(QString, expectedDataSize);
+
+ QByteArray expChunkSize = writeHexString(expectedChunkSize);
+ QByteArray expDataSize = writeHexString(expectedDataSize);
+ quint32 dSize = dataSize.toLongLong();
+
+ try
+ {
+ QBuffer data;
+ data.open(QBuffer::ReadWrite);
+ writeHexString(header, &data);
+
+ data.seek(0);
+ WavHeader wavHeader(&data);
+ wavHeader.resizeData(dSize);
+
+ QByteArray res = wavHeader.toByteArray();
+ QByteArray resChunkSize = res.mid(4, 4);
+ QByteArray resDataSize = res.mid(res.length() - 4, 4);
+
+ QCOMPARE(resDataSize.toHex(), expDataSize.toHex());
+ QCOMPARE(resChunkSize.toHex(), expChunkSize.toHex());
+ }
+ catch (FlaconError &err)
+ {
+ FAIL(err.what());
+ }
+ catch (char const *err)
+ {
+ QFAIL(err);
+ }
 }
 
 
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testResizeWavHeader_data()
+{
+ QTest::addColumn<QString>("header", nullptr);
+ QTest::addColumn<QString>("dataSize", nullptr);
+ QTest::addColumn<QString>("expectedChunkSize", nullptr);
+ QTest::addColumn<QString>("expectedDataSize", nullptr);
+
+ QTest::newRow("01")
+ << "52 49 46 46" // RIFF
+ "10 00 00 00" // 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 00 00 00" // data size
+
+ << "38648064" // new duration
+ << "24 B9 4D 02" // expected chunk size
+ << "00 B9 4D 02"; // expected data size
+
+}

flacon-5.4.0.tar.gz/tests/testflacon.cpp -> flacon-5.5.1.tar.gz/tests/testflacon.cpp Changed

@@ -35,7 +35,6 @@
 #include <QDir>
 #include <QThreadPool>
 
-#define protected public
 #include "../disk.h"
 #include "../settings.h"
 #include "../project.h"
@@ -57,7 +56,7 @@
 QObject(parent),
 mTmpDir(TEST_OUT_DIR),
 mDataDir(TEST_DATA_DIR),
- mStandardDisk(0)
+ mStandardDisk(nullptr)
 {
 }
 
@@ -184,7 +183,7 @@
 ************************************************/
 Disk *TestFlacon::standardDisk()
 {
- if (mStandardDisk == 0)
+ if (mStandardDisk == nullptr)
 {
 QString cueFile = dir() + "testTrackResultFileName.cue";
 
@@ -299,10 +298,10 @@
 ************************************************/
 void TestFlacon::testByteArraySplit_data()
 {
- QTest::addColumn<QByteArray>("inArray");
- QTest::addColumn<char>("separator");
- QTest::addColumn<QByteArray>("expectedLeft");
- QTest::addColumn<QByteArray>("expectedRight");
+ QTest::addColumn<QByteArray>("inArray", nullptr);
+ QTest::addColumn<char>("separator", nullptr);
+ QTest::addColumn<QByteArray>("expectedLeft", nullptr);
+ QTest::addColumn<QByteArray>("expectedRight", nullptr);
 
 QTest::newRow("'' split by ' '")
 << QByteArray()
@@ -353,10 +352,82 @@
 ************************************************/
 void TestFlacon::testSafeString()
 {
- QCOMPARE(safeString("A|B/C|D\\E:F*G?H"), QString("A-B-C-D-E-F-G-H"));
+ QFETCH(QString, string);
+ QFETCH(QString, expected);
+ QString result = safeString(string);
+ QCOMPARE(result, expected);
 }
 
 
+/************************************************
+
+ ************************************************/
+void TestFlacon::testSafeString_data()
+{
+ QTest::addColumn<QString>("string", nullptr);
+ QTest::addColumn<QString>("expected", nullptr);
+
+ for (char c=1; c<=31; ++c )
+ {
+ if (c != '\t' && c != '\n')
+ QTest::newRow(QString("01 - \\%1").arg(int(c), 2, 16, QChar('0')).toLocal8Bit())
+ << QString(c)
+ << "";
+ }
+
+ QTest::newRow("01 - \\t") << "\t" << " ";
+ QTest::newRow("01 - \\n") << "\n" << " ";
+ QTest::newRow("01 - /") << "/" << "-";
+ QTest::newRow("01 - \\") << "\\" << "-";
+ QTest::newRow("01 - *") << "*" << "_";
+ QTest::newRow("01 - :") << ":" << "_";
+ QTest::newRow("01 - ?") << "?" << "";
+ QTest::newRow("01 - <") << "<" << "[";
+ QTest::newRow("01 - >") << ">" << "]";
+ QTest::newRow("01 - \"") << "\"" << "'";
+
+
+ for (char c=1; c<=31; ++c )
+ {
+ if (c != '\t' && c != '\n')
+ QTest::newRow(QString("02 - A\\%1B").arg(int(c), 2, 16, QChar('0')).toLocal8Bit())
+ << "A" + QString(c) + "B"
+ << "AB";
+ }
+
+ QTest::newRow("02 - A\\tB") << "A\tB" << "A B";
+ QTest::newRow("02 - A\\nB") << "A\nB" << "A B";
+ QTest::newRow("02 - A/B") << "A/B" << "A-B";
+ QTest::newRow("02 - A\\B") << "A\\B" << "A-B";
+ QTest::newRow("02 - A*B") << "A*B" << "A_B";
+ QTest::newRow("02 - A:B") << "A:B" << "A_B";
+ QTest::newRow("02 - A?B") << "A?B" << "AB";
+ QTest::newRow("02 - A<B") << "A<B" << "A[B";
+ QTest::newRow("02 - A>B") << "A>B" << "A]B";
+ QTest::newRow("02 - A\"B") << "A\"B" << "A'B";
+
+
+ QTest::newRow("03.1 single dot")
+ << "."
+ << "_";
+
+ QTest::newRow("03.2 double dot")
+ << ".."
+ << "__";
+
+ QTest::newRow("03.3 ?single dot?")
+ << "?.?"
+ << "_";
+
+ QTest::newRow("03.4 ?double dot?")
+ << "?..?"
+ << "__";
+
+ QTest::newRow("04 UTF8")
+ << "Русский текст"
+ << "Русский текст";
+}
+
 
 /************************************************
 
@@ -464,9 +535,9 @@
 ************************************************/
 void TestFlacon::testTrackResultFileName_data()
 {
- QTest::addColumn<QString>("cue");
- QTest::addColumn<QString>("pattern");
- QTest::addColumn<QString>("expected");
+ QTest::addColumn<QString>("cue", nullptr);
+ QTest::addColumn<QString>("pattern", nullptr);
+ QTest::addColumn<QString>("expected", nullptr);
 
 
 QTest::newRow("1.1")
@@ -681,6 +752,101 @@
 << "Text}/{%n}/{%n Text}/{%A}/{%A Text}"
 << "Text}/01/01 Text//.wav";
 
+ QTest::newRow("3.1")
+ << R"( REM GENRE Genre
+ REM DATE 2013
+ REM DISCID 123456789
+ REM COMMENT "ExactAudioCopy v0.99pb4"
+ PERFORMER "Artist"
+ TITLE "."
+ FILE "en.wav" WAVE
+ TRACK 01 AUDIO
+ TITLE "Song01"
+ INDEX 01 00:00:00
+ TRACK 02 AUDIO
+ TITLE "Song02"
+ INDEX 01 03:39:10
+ TRACK 03 AUDIO
+ TITLE "Song03"
+ INDEX 01 07:25:42
+ TRACK 04 AUDIO
+ TITLE "Song04"
+ INDEX 01 12:04:72)"
+ << "%a/%A/%n - %t"
+ << "Artist/_/01 - Song01.wav";
+
+
+ QTest::newRow("3.2")
+ << R"( REM GENRE Genre
+ REM DATE 2013
+ REM DISCID 123456789
+ REM COMMENT "ExactAudioCopy v0.99pb4"
+ PERFORMER "Artist"
+ TITLE ".."
+ FILE "en.wav" WAVE
+ TRACK 01 AUDIO
+ TITLE "Song01"
+ INDEX 01 00:00:00
+ TRACK 02 AUDIO
+ TITLE "Song02"
+ INDEX 01 03:39:10
+ TRACK 03 AUDIO
+ TITLE "Song03"
+ INDEX 01 07:25:42
+ TRACK 04 AUDIO
+ TITLE "Song04"
+ INDEX 01 12:04:72)"
+ << "%a/%A/%n - %t"
+ << "Artist/__/01 - Song01.wav";
+
+
+ QTest::newRow("3.3")
+ << R"( REM GENRE Genre
+ REM DATE 2013
+ REM DISCID 123456789
+ REM COMMENT "ExactAudioCopy v0.99pb4"
+ PERFORMER "."
+ TITLE ".."
+ FILE "en.wav" WAVE
+ TRACK 01 AUDIO
+ TITLE "Song01"
+ INDEX 01 00:00:00
+ TRACK 02 AUDIO
+ TITLE "Song02"
+ INDEX 01 03:39:10
+ TRACK 03 AUDIO
+ TITLE "Song03"
+ INDEX 01 07:25:42
+ TRACK 04 AUDIO
+ TITLE "Song04"
+ INDEX 01 12:04:72)"
+ << "%a%A/%n - %t"
+ << "___/01 - Song01.wav";
+
+
+ QTest::newRow("4.1")
+ << R"( REM GENRE Genre
+ REM DATE 2013
+ REM DISCID 123456789
+ REM COMMENT "ExactAudioCopy v0.99pb4"
+ PERFORMER "Автор"
+ TITLE "Альбом"
+ FILE "en.wav" WAVE
+ TRACK 01 AUDIO
+ TITLE "Песнь"
+ INDEX 01 00:00:00
+ TRACK 02 AUDIO
+ TITLE "Song02"
+ INDEX 01 03:39:10
+ TRACK 03 AUDIO
+ TITLE "Song03"
+ INDEX 01 07:25:42
+ TRACK 04 AUDIO
+ TITLE "Song04"
+ INDEX 01 12:04:72)"
+ << "%a_%A/%n - %t"
+ << "Автор_Альбом/01 - Песнь.wav";
+
 }
 
 
@@ -726,10 +892,10 @@
 void TestFlacon::testTrackResultFilePath_data()
 {
 //QTest::addColumn<QString>("cueFile");
- QTest::addColumn<QString>("outDir");
- QTest::addColumn<QString>("pattern");
- QTest::addColumn<QString>("expected");
- QTest::addColumn<QString>("cueFile");
+ QTest::addColumn<QString>("outDir", nullptr);
+ QTest::addColumn<QString>("pattern", nullptr);
+ QTest::addColumn<QString>("expected", nullptr);
+ QTest::addColumn<QString>("cueFile", nullptr);
 
 
 QTest::newRow("1: /home/user/music")
@@ -860,10 +1026,10 @@
 ************************************************/
 void TestFlacon::testTrackSetCodepages_data()
 {
- QTest::addColumn<QString>("cueFile");
- QTest::addColumn<QString>("sampleFile");
- QTest::addColumn<QString>("codepageBefore");
- QTest::addColumn<QString>("codepageAfter");
+ QTest::addColumn<QString>("cueFile", nullptr);
+ QTest::addColumn<QString>("sampleFile", nullptr);
+ QTest::addColumn<QString>("codepageBefore", nullptr);
+ QTest::addColumn<QString>("codepageAfter", nullptr);
 
 
 QTest::newRow("01 TrackSet_UTF-8")
@@ -919,9 +1085,9 @@
 ************************************************/
 void TestFlacon::testOutFormatGainArgs_data()
 {
- QTest::addColumn<QString>("formatId");
- QTest::addColumn<SettingsValues>("config");
- QTest::addColumn<QString>("expected");
+ QTest::addColumn<QString>("formatId", nullptr);
+ QTest::addColumn<SettingsValues>("config", nullptr);
+ QTest::addColumn<QString>("expected", nullptr);
 
 SettingsValues cfg;
 
@@ -1056,7 +1222,7 @@
 ************************************************/
 void TestFlacon::testCueIndex_data()
 {
- QTest::addColumn<QString>("expected");
+ QTest::addColumn<QString>("expected", nullptr);
 
 
 QTest::newRow("CD") << "00:00:00";
@@ -1092,19 +1258,25 @@
 }
 
 
+class Test_DiskPipeline: public DiskPipeline {
+public:
+ static int calcQuality(int input, int preferences, int formatMax)
+ { return DiskPipeline::calcQuality(input, preferences, formatMax) ;}
+
+};
+
 /************************************************
 *
 ************************************************/
 void TestFlacon::testDiskPipelineCalcQuality()
 {
- //int input = QTest::currentDataTag();
 QFETCH(int, input);
 QFETCH(int, preferences);
 QFETCH(int, maxFormat);
 
 QFETCH(int, expected);
 
- int res = DiskPipeline::calcQuality(input, preferences, maxFormat);
+ int res = Test_DiskPipeline::calcQuality(input, preferences, maxFormat);
 QCOMPARE(res, expected);
 }
 
@@ -1114,10 +1286,10 @@
 ************************************************/
 void TestFlacon::testDiskPipelineCalcQuality_data()
 {
- QTest::addColumn<int>("preferences");
- QTest::addColumn<int>("maxFormat");
- QTest::addColumn<int>("input");
- QTest::addColumn<int>("expected");
+ QTest::addColumn<int>("preferences", nullptr);
+ QTest::addColumn<int>("maxFormat", nullptr);
+ QTest::addColumn<int>("input", nullptr);
+ QTest::addColumn<int>("expected", nullptr);
 
 // preferences maxFormat input expected
 QTest::newRow("Bits 01") << 0 << 16 << 16 << 0;

flacon-5.4.0.tar.gz/tests/testflacon.h -> flacon-5.5.1.tar.gz/tests/testflacon.h Changed

flacon-5.4.0.tar.gz/tests/tools.cpp -> flacon-5.5.1.tar.gz/tests/tools.cpp Changed

@@ -40,6 +40,46 @@
 #include "../disk.h"
 #include "../converter/decoder.h"
 
+class HashDevice: public QIODevice {
+public:
+ HashDevice(QCryptographicHash::Algorithm method, QObject *parent = nullptr):
+ QIODevice(parent),
+ mHash(method),
+ mInHeader(true)
+ {
+ }
+
+ QByteArray result() const { return mHash.result(); }
+
+
+protected:
+ qint64 readData(char*, qint64) { return -1; }
+
+ qint64 writeData(const char *data, qint64 len)
+ {
+ if (mInHeader)
+ {
+ mBuf.append(data, len);
+ int n = mBuf.indexOf("data");
+ if (n > -1 && n < mBuf.length() - 8)
+ {
+ mInHeader = false;
+ mHash.addData(mBuf.data() + n + 8, mBuf.length() - n - 8);
+ }
+ return len;
+ }
+
+ mHash.addData(data, len);
+ return len;
+ }
+
+private:
+ QByteArray mBuf;
+ QCryptographicHash mHash;
+ bool mInHeader;
+};
+
+
 /************************************************
 *
 ************************************************/
@@ -63,29 +103,11 @@
 return "";
 }
 
- QBuffer buf;
- buf.open(QBuffer::ReadWrite);
- try
- {
- decoder.extract(CueTime(), CueTime(), &buf);
- }
- catch (FlaconError &err)
- {
- FAIL(QString("Can't extract file '%1': %2")
- .arg(fileName)
- .arg(err.what()).toLocal8Bit());
- return "";
- }
-
+ HashDevice hash(QCryptographicHash::Md5);
+ hash.open(QIODevice::WriteOnly);
+ decoder.extract(CueTime(), CueTime(), &hash);
 decoder.close();
 
- buf.reset();
- QByteArray ba = buf.read(1024);
- int n = ba.indexOf("data");
- buf.seek(n + 8);
-
- QCryptographicHash hash(QCryptographicHash::Md5);
- hash.addData(&buf);
 return hash.result().toHex();
 }
 
@@ -183,44 +205,56 @@
 ************************************************/
 void writeHexString(const QString &str, QIODevice *out)
 {
- bool ok;
- int i =0;
- while (i<str.length()-1)
+ for (QString line : str.split('\n'))
 {
- if (str.at(i).isSpace())
+ for (int i=0; i<line.length()-1;)
 {
- ++i;
- continue;
- }
+ // Skip comments
+ if (line.at(i) == '/')
+ break;
+
+ if (line.at(i).isSpace())
+ {
+ ++i;
+ continue;
+ }
 
- union {
- quint16 n16;
- char b;
- };
- n16 = str.mid(i, 2).toShort(&ok, 16);
 
- out->write(&b, 1);
- if (!ok)
- throw QString("Incorrect HEX data at %1:\n%2").arg(i).arg(str);
- i+=2;
+ union {
+ quint16 n16;
+ char b;
+ };
+
+ bool ok;
+ n16 = line.mid(i, 2).toShort(&ok, 16);
+ if (!ok)
+ throw QString("Incorrect HEX data at %1:\n%2").arg(i).arg(line);
+
+ out->write(&b, 1);
+ i+=2;
+ }
 }
 }
 
+
 /************************************************
 *
 ************************************************/
-void createWavFile(const QString &fileName, int duration, StdWavHeader::Quality quality)
+QByteArray writeHexString(const QString &str)
 {
- if (QFileInfo(fileName).exists())
- return;
-
- QFile file(fileName);
- if (!file.open(QFile::WriteOnly | QFile::Truncate))
- QFAIL(QString("Can't create file '%1': %2").arg(fileName, file.errorString()).toLocal8Bit());
+ QBuffer data;
+ data.open(QBuffer::ReadWrite);
+ writeHexString(str, &data);
+ return data.buffer();
+}
 
 
- int dataSize = StdWavHeader::bytesPerSecond(quality) * duration;
- file.write(StdWavHeader(dataSize, quality).toByteArray());
+/************************************************
+ *
+ ************************************************/
+static void writeTestWavData(QIODevice *device, quint64 dataSize)
+{
+ static const int BUF_SIZE = 1024 * 1024;
 
 quint32 x=123456789, y=362436069, z=521288629;
 union {
@@ -228,6 +262,10 @@
 char bytes[4];
 };
 
+ QByteArray buf;
+
+ buf.reserve(4 * 1024 * 1024);
+ buf.reserve(BUF_SIZE);
 for (uint i=0; i<(dataSize/ sizeof(quint32)); ++i)
 {
 // xorshf96 ...................
@@ -241,9 +279,69 @@
 z = t ^ x ^ y;
 // xorshf96 ...................
 
- file.write(bytes, 4);
+ buf.append(bytes, 4);
+ if (buf.size() >= BUF_SIZE)
+ {
+ device->write(buf);
+ buf.resize(0);
+ }
 }
 
+ device->write(buf);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void createWavFile(const QString &fileName, const QString &header, const int duration)
+{
+ QBuffer wavHdr;
+ wavHdr.open(QBuffer::ReadWrite);
+ writeHexString(header, &wavHdr);
+
+ if (duration) {
+ quint32 bitsPerSample =
+ (quint8(wavHdr.buffer()[28]) << 0) +
+ (quint8(wavHdr.buffer()[29]) << 8) +
+ (quint8(wavHdr.buffer()[30]) << 16) +
+ (quint8(wavHdr.buffer()[31]) << 24);
+
+ quint32 ckSize = bitsPerSample * duration + wavHdr.buffer().size() - 8 + 8;
+ wavHdr.buffer()[4] = quint8(ckSize >> 0);
+ wavHdr.buffer()[5] = quint8(ckSize >> 8);
+ wavHdr.buffer()[6] = quint8(ckSize >> 16);
+ wavHdr.buffer()[7] = quint8(ckSize >> 24);
+ }
+
+
+ // See http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/WAVE/WAVE.html
+ quint32 ckSize =
+ (quint8(wavHdr.buffer()[4]) << 0) +
+ (quint8(wavHdr.buffer()[5]) << 8) +
+ (quint8(wavHdr.buffer()[6]) << 16) +
+ (quint8(wavHdr.buffer()[7]) << 24);
+
+ quint32 dataSize = ckSize - wavHdr.size();
+
+ QFile file(fileName);
+
+ if (file.exists() && file.size() == ckSize + 8)
+ return;
+
+ if (!file.open(QFile::WriteOnly | QFile::Truncate))
+ QFAIL(QString("Can't create file '%1': %2").arg(fileName, file.errorString()).toLocal8Bit());
+
+ file.write(wavHdr.buffer());
+ file.write("data", 4);
+ char buf[4];
+ buf[0] = quint8(dataSize);
+ buf[1] = quint8(dataSize >> 8);
+ buf[2] = quint8(dataSize >> 16);
+ buf[3] = quint8(dataSize >> 24);
+ file.write(buf, 4);
+
+ writeTestWavData(&file, dataSize);
 file.close();
 }
 
@@ -253,7 +351,7 @@
 ************************************************/
 void encodeAudioFile(const QString &wavFileName, const QString &outFileName)
 {
- if (QFileInfo(outFileName).exists())
+ if (QFileInfo(outFileName).exists() && QFileInfo(outFileName).size() > 1024)
 return;
 
 QString program;
@@ -302,20 +400,29 @@
 QFAIL(QString("Can't create file '%1': unknown file format").arg(outFileName).toLocal8Bit());
 }
 
-#if 1
+
+ bool ok = true;
 QProcess proc;
 proc.start(program, args);
- proc.waitForFinished(3 * 60 * 10000);
- if (proc.exitStatus() != 0)
- QFAIL(QString("Can't encode to file '%1':").arg(outFileName).toLocal8Bit() + proc.readAllStandardError());
-#else
- QProcess proc;
- if (proc.execute(program, args) != 0)
- QFAIL(QString("Can't encode to file '%1':").arg(outFileName).toLocal8Bit() + proc.readAllStandardError());
-#endif
+ ok = proc.waitForStarted(3 * 1000);
+ ok = ok && proc.waitForFinished(5 * 60 * 1000) ;
+ ok = ok && (proc.exitStatus() == 0);
+
+ if (!ok)
+ {
+ QFAIL(QString("Can't encode %1 %2:")
+ .arg(program)
+ .arg(args.join(" "))
+ .toLocal8Bit()
+ + proc.readAllStandardError());
+ }
 
 if (!QFileInfo(outFileName).isFile())
- QFAIL(QString("Can't encode to file '%1' (file don't exists'):").arg(outFileName).toLocal8Bit() + proc.readAllStandardError());
+ {
+ QFAIL(QString("Can't encode to file '%1' (file don't exists'):")
+ .arg(outFileName).toLocal8Bit()
+ + proc.readAllStandardError());
+ }
 }
 
 
@@ -346,3 +453,4 @@
 }
 return nullptr;
 }
+

flacon-5.4.0.tar.gz/tests/tools.h -> flacon-5.5.1.tar.gz/tests/tools.h Changed

flacon-5.4.0.tar.gz/translations/flacon_cs.ts -> flacon-5.5.1.tar.gz/translations/flacon_cs.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_cs_CZ.ts -> flacon-5.5.1.tar.gz/translations/flacon_cs_CZ.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_de.ts -> flacon-5.5.1.tar.gz/translations/flacon_de.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_el.ts -> flacon-5.5.1.tar.gz/translations/flacon_el.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_es.ts -> flacon-5.5.1.tar.gz/translations/flacon_es.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_es_MX.ts -> flacon-5.5.1.tar.gz/translations/flacon_es_MX.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_et.ts -> flacon-5.5.1.tar.gz/translations/flacon_et.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_fr.desktop -> flacon-5.5.1.tar.gz/translations/flacon_fr.desktop Changed

flacon-5.4.0.tar.gz/translations/flacon_fr.ts -> flacon-5.5.1.tar.gz/translations/flacon_fr.ts Changed

@@ -43,7 +43,7 @@
 </message>
 <message>
 <source>Extracts individual tracks from one big audio file containing the entire album.</source>
- <translation>Extrait individuellement les pistes d’un fichier audio volumineux contenant l’album entier.</translation>
+ <translation>Extrait individuellement les plages d’un fichier audio volumineux contenant l’album entier.</translation>
 </message>
 <message>
 <source>Copyright: %1-%2 %3</source>
@@ -225,7 +225,7 @@
 </message>
 <message>
 <source>First track pregap:</source>
- <translation>Présilence de la première piste : </translation>
+ <translation>Présilence de la première plage : </translation>
 </message>
 <message>
 <source>Rescan</source>
@@ -241,7 +241,7 @@
 </message>
 <message>
 <source>Add to first track</source>
- <translation>Ajouter à la première piste</translation>
+ <translation>Ajouter à la première plage</translation>
 </message>
 <message>
 <source>General</source>
@@ -340,11 +340,11 @@
 </message>
 <message>
 <source>Per track CUE sheet</source>
- <translation>Fichier CUE par piste</translation>
+ <translation>Fichier CUE par plage</translation>
 </message>
 <message>
 <source>Create per track CUE sheet</source>
- <translation>Créer un fichier CUE par piste</translation>
+ <translation>Créer un fichier CUE par plage</translation>
 </message>
 <message>
 <source>Same as source</source>
@@ -751,6 +751,17 @@
 </message>
 </context>
 <context>
+ <name>DiskPipeline</name>
+ <message>
+ <source>I can't rename file:
+%1 to %2
+%3</source>
+ <translation>Je ne peux pas renommer le fichier :
+%1 en %2
+%3</translation>
+ </message>
+</context>
+<context>
 <name>Encoder</name>
 <message>
 <source>Encoder error:
@@ -792,7 +803,7 @@
 <message>
 <source>Per Track</source>
 <comment>ReplayGain type combobox</comment>
- <translation>Par piste</translation>
+ <translation>Par plage</translation>
 </message>
 <message>
 <source>Per Album</source>
@@ -806,7 +817,7 @@
 Using the album-gain analysis will preserve the volume differences within an album.</source>
 <translation>ReplayGain est une norme permettant d’égaliser l’intensité perçue du son des formats de fichiers audio sur ordinateur.
 
-L’analyse peut être effectuée sur des pistes individuelles de manière à ce que toutes les pistes soient jouées à un volume sonore équivalent.
+L’analyse peut être effectuée sur des plages individuelles de manière à ce que toutes les plages soient jouées à un volume sonore équivalent.
 L’utilisation de l’analyse par album permet de préserver les différences de volume pour un même album.</translation>
 </message>
 <message>
@@ -971,11 +982,11 @@
 </message>
 <message>
 <source>Insert &quot;Track number&quot;</source>
- <translation>Insérer le « Numéro de piste »</translation>
+ <translation>Insérer le « Numéro de plage »</translation>
 </message>
 <message>
 <source>Insert &quot;Total number of tracks&quot;</source>
- <translation>Insérer le « Nombre total de pistes »</translation>
+ <translation>Insérer le « Nombre total de plages »</translation>
 </message>
 <message>
 <source>Insert &quot;Artist&quot;</source>
@@ -987,7 +998,7 @@
 </message>
 <message>
 <source>Insert &quot;Track title&quot;</source>
- <translation>Insérer le « Titre de la piste »</translation>
+ <translation>Insérer le « Titre de la plage »</translation>
 </message>
 <message>
 <source>Insert &quot;Year&quot;</source>
@@ -1052,11 +1063,11 @@
 &lt;/style&gt;
 Les marqueurs commencent par %. Vous pouvez utiliser les marqueurs suivants  :
 &lt;table&gt;
- &lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%n&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Numéro de piste &lt;/td&gt;
- &lt;td class=&quot;term&quot;&gt;%N&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Nombre total de pistes&lt;/td&gt;&lt;/tr&gt;
+ &lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%n&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Numéro de plage &lt;/td&gt;
+ &lt;td class=&quot;term&quot;&gt;%N&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Nombre total de plages&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%a&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Artiste&lt;/td&gt;
 &lt;td class=&quot;term&quot;&gt;%A&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Titre de l’album&lt;/td&gt;&lt;/tr&gt;
- &lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%t&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Titre de la piste&lt;/td&gt;
+ &lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%t&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Titre de la plage&lt;/td&gt;
 &lt;td class=&quot;term&quot;&gt;%y&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Année&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%g&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Genre&lt;/td&gt;
 &lt;td class=&quot;term&quot;&gt;&lt;/td&gt; &lt;td class=&quot;def&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
@@ -1176,7 +1187,7 @@
 <message>
 <source>Start conversion process for the selected tracks</source>
 <extracomment>Main menu item tooltip</extracomment>
- <translation>Lancer le processus de conversion pour les pistes sélectionnées</translation>
+ <translation>Lancer le processus de conversion pour les plages sélectionnées</translation>
 </message>
 <message>
 <source>Ctrl+Shift+W</source>
@@ -1290,12 +1301,12 @@
 <message>
 <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. Incorrect track number on line %2.</source>
 <comment>Cue parser error.</comment>
- <translation>&lt;b&gt;%1&lt;/b&gt; n’est pas un fichier CUE valide. Le numéro de piste est erroné sur la ligne %2.</translation>
+ <translation>&lt;b&gt;%1&lt;/b&gt; n’est pas un fichier CUE valide. Le numéro de plage est erroné sur la ligne %2.</translation>
 </message>
 <message>
 <source>&lt;b&gt;%1&lt;/b&gt; is not a valid CUE file. Incorrect track index on line %2.</source>
 <comment>Cue parser error.</comment>
- <translation>&lt;b&gt;%1&lt;/b&gt; n’est pas un fichier CUE valide. L’index de piste est erroné sur la ligne %2.</translation>
+ <translation>&lt;b&gt;%1&lt;/b&gt; n’est pas un fichier CUE valide. L’index de plage est erroné sur la ligne %2.</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>
@@ -1358,7 +1369,7 @@
 <message>
 <source>Track title:</source>
 <comment>Music tag name</comment>
- <translation>Titre de la piste :</translation>
+ <translation>Titre de la plage :</translation>
 </message>
 <message>
 <source>Comment:</source>
@@ -1368,7 +1379,7 @@
 <message>
 <source>Start track number:</source>
 <comment>Music tag name</comment>
- <translation>Numéro de piste de début :</translation>
+ <translation>Numéro de plage de début :</translation>
 </message>
 <message>
 <source>Album performer:</source>
@@ -1427,7 +1438,7 @@
 </message>
 <message>
 <source>Tracks:</source>
- <translation>Pistes :</translation>
+ <translation>Plages :</translation>
 </message>
 <message>
 <source>Audio:</source>
@@ -1439,7 +1450,7 @@
 <message>
 <source>Track</source>
 <comment>Table header.</comment>
- <translation>Piste</translation>
+ <translation>Plage</translation>
 </message>
 <message>
 <source>Title</source>

flacon-5.4.0.tar.gz/translations/flacon_gl.ts -> flacon-5.5.1.tar.gz/translations/flacon_gl.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_he.ts -> flacon-5.5.1.tar.gz/translations/flacon_he.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_hu.ts -> flacon-5.5.1.tar.gz/translations/flacon_hu.ts Changed

@@ -61,7 +61,7 @@
 <message>
 <source>WavPack support patch</source>
 <comment>Thanks on the about page</comment>
- <translation>Wavpack támogató patch</translation>
+ <translation>Wavpack támogató folt</translation>
 </message>
 <message>
 <source>Packaging, testing</source>
@@ -81,12 +81,12 @@
 <message>
 <source>Icon for application</source>
 <comment>Thanks on the about page</comment>
- <translation type="unfinished"/>
+ <translation>Ikon az alkalmazáshoz</translation>
 </message>
 <message>
 <source>Icons for application</source>
 <comment>Thanks on the about page</comment>
- <translation type="unfinished"/>
+ <translation>Ikonok az alkalmazáshoz</translation>
 </message>
 </context>
 <context>
@@ -754,6 +754,17 @@
 </message>
 </context>
 <context>
+ <name>DiskPipeline</name>
+ <message>
+ <source>I can't rename file:
+%1 to %2
+%3</source>
+ <translation>Nem tudtam átnevezni:
+%1 erre %2
+%3</translation>
+ </message>
+</context>
+<context>
 <name>Encoder</name>
 <message>
 <source>Encoder error:
@@ -1189,11 +1200,11 @@
 </message>
 <message>
 <source>Insert &quot;Disk number&quot;</source>
- <translation type="unfinished"/>
+ <translation>Lemezszám beszúrása</translation>
 </message>
 <message>
 <source>Insert &quot;Total number of disks&quot;</source>
- <translation type="unfinished"/>
+ <translation>&quot;Összes lemezszám&quot; beszúrása</translation>
 </message>
 </context>
 <context>

flacon-5.4.0.tar.gz/translations/flacon_id.ts -> flacon-5.5.1.tar.gz/translations/flacon_id.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_it.ts -> flacon-5.5.1.tar.gz/translations/flacon_it.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_ja_JP.ts -> flacon-5.5.1.tar.gz/translations/flacon_ja_JP.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_lt.ts -> flacon-5.5.1.tar.gz/translations/flacon_lt.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_ms_MY.ts -> flacon-5.5.1.tar.gz/translations/flacon_ms_MY.ts Changed

@@ -81,12 +81,12 @@
 <message>
 <source>Icon for application</source>
 <comment>Thanks on the about page</comment>
- <translation type="unfinished"/>
+ <translation>Ikon untuk aplikasi</translation>
 </message>
 <message>
 <source>Icons for application</source>
 <comment>Thanks on the about page</comment>
- <translation type="unfinished"/>
+ <translation>Ikon untuk aplikasi</translation>
 </message>
 </context>
 <context>
@@ -369,7 +369,7 @@
 <message>
 <source>File name format:</source>
 <extracomment>Settings dialog, label for the edit control with name of the created CUE file.</extracomment>
- <translation type="unfinished"/>
+ <translation>Format nama fail:</translation>
 </message>
 <message>
 <source>Insert &quot;Artist&quot;</source>
@@ -723,7 +723,7 @@
 <message>
 <source>I can&apos;t write file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
 <comment>Error string, %1 is a filename, %2 error message</comment>
- <translation type="unfinished"/>
+ <translation>Saya tidak dapat tulis fail &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
 </message>
 </context>
 <context>
@@ -752,6 +752,17 @@
 </message>
 </context>
 <context>
+ <name>DiskPipeline</name>
+ <message>
+ <source>I can't rename file:
+%1 to %2
+%3</source>
+ <translation>Tidak dapat namakan semula fail:
+%1 menjadi %2
+%3</translation>
+ </message>
+</context>
+<context>
 <name>Encoder</name>
 <message>
 <source>Encoder error:
@@ -1174,25 +1185,25 @@
 <message>
 <source>Convert selected</source>
 <extracomment>Main menu item</extracomment>
- <translation type="unfinished"/>
+ <translation>Pertukaran format terpilih</translation>
 </message>
 <message>
 <source>Start conversion process for the selected tracks</source>
 <extracomment>Main menu item tooltip</extracomment>
- <translation type="unfinished"/>
+ <translation>Mulakan proses pertukaran format untuk trek terpilih</translation>
 </message>
 <message>
 <source>Ctrl+Shift+W</source>
 <extracomment>Main menu item shortcut</extracomment>
- <translation type="unfinished"/>
+ <translation>Ctrl+Shift+W</translation>
 </message>
 <message>
 <source>Insert &quot;Disk number&quot;</source>
- <translation type="unfinished"/>
+ <translation>Sisip &quot;Nombor cakera&quot;</translation>
 </message>
 <message>
 <source>Insert &quot;Total number of disks&quot;</source>
- <translation type="unfinished"/>
+ <translation>Sisip &quot;Jumlah bilangan cakera&quot;</translation>
 </message>
 </context>
 <context>

flacon-5.4.0.tar.gz/translations/flacon_nb.ts -> flacon-5.5.1.tar.gz/translations/flacon_nb.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_nl.ts -> flacon-5.5.1.tar.gz/translations/flacon_nl.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_nl_BE.ts -> flacon-5.5.1.tar.gz/translations/flacon_nl_BE.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_pl.ts -> flacon-5.5.1.tar.gz/translations/flacon_pl.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_pl_PL.ts -> flacon-5.5.1.tar.gz/translations/flacon_pl_PL.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_pt_BR.ts -> flacon-5.5.1.tar.gz/translations/flacon_pt_BR.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_pt_PT.ts -> flacon-5.5.1.tar.gz/translations/flacon_pt_PT.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_ro_RO.ts -> flacon-5.5.1.tar.gz/translations/flacon_ro_RO.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_ru.ts -> flacon-5.5.1.tar.gz/translations/flacon_ru.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_sr.ts -> flacon-5.5.1.tar.gz/translations/flacon_sr.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_sr@latin.ts -> flacon-5.5.1.tar.gz/translations/flacon_sr@latin.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_tr.ts -> flacon-5.5.1.tar.gz/translations/flacon_tr.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_uk.ts -> flacon-5.5.1.tar.gz/translations/flacon_uk.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_zh_CN.ts -> flacon-5.5.1.tar.gz/translations/flacon_zh_CN.ts Changed

flacon-5.4.0.tar.gz/translations/flacon_zh_TW.ts -> flacon-5.5.1.tar.gz/translations/flacon_zh_TW.ts Changed

flacon-5.4.0.tar.gz/translations/src.flacon.ts -> flacon-5.5.1.tar.gz/translations/src.flacon.ts Changed

@@ -52,28 +52,42 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
+ <source>Bug tracker %1</source>
+ <comment>About dialog, About tab</comment>
+ <translation type="unfinished"></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>
+ </message>
+ <message>
 <source>WavPack support patch</source>
+ <comment>Thanks on the about page</comment>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <source>Packaging, testing</source>
+ <comment>Thanks on the about page</comment>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <source>Improvements in the UI</source>
+ <comment>Thanks on the about page</comment>
 <translation type="unfinished"></translation>
 </message>
 <message>
 <source>Flacon account on github.com</source>
+ <comment>Thanks on the about page</comment>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Bug tracker %1</source>
- <comment>About dialog, About tab</comment>
+ <source>Icon for application</source>
+ <comment>Thanks on the about page</comment>
 <translation type="unfinished"></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>
+ <source>Icons for application</source>
+ <comment>Thanks on the about page</comment>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -708,6 +722,15 @@
 </message>
 </context>
 <context>
+ <name>DiskPipeline</name>
+ <message>
+ <source>I can&apos;t rename file:
+%1 to %2
+%3</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
 <name>Encoder</name>
 <message>
 <source>Encoder error:

flacon-5.4.0.tar.gz/types.cpp -> flacon-5.5.1.tar.gz/types.cpp Changed

@@ -27,6 +27,7 @@
 #include "types.h"
 #include <QVector>
 #include <QTextStream>
+#include <QDebug>
 
 /************************************************
 *
@@ -312,16 +313,71 @@
 
 
 /************************************************
-
+	Windows special symbols
+	Use any character, except for the following:
+	The following reserved characters:
+		< (less than)
+		> (greater than)
+		: (colon)
+		" (double quote)
+		/ (forward slash)
+		\ (backslash)
+		| (vertical bar or pipe)
+		? (question mark)
+		* (asterisk)
+		\0 Integer value zero, sometimes referred to as the ASCII NUL character.
+
+		\1-\31 Characters whose integer representations are in the range from 1 through 31
+	 https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#file-and-directory-names
+
+Characters from 1 through 31, except TAB and NEW LINE	remove
+TAB (\t)	replace to " " (space)
+NEW LINE (\n)	replace to " " (space)
+/	replace to - (dash)
+\	replace to - (dash)
+:	replace to _ (underscore)
+*	replace to _ (underscore)
+?	remove
+<	replace to _
+>	replace to _
+"	replace to ' (single quote)
 ************************************************/
 QString safeString(const QString &str)
 {
- QString res = str;
- res.replace('|', "-");
- res.replace('/', "-");
- res.replace('\\', "-");
- res.replace(':', "-");
- res.replace('*', "-");
- res.replace('?', "-");
+ QString res = "";
+
+ foreach (const QChar c, str) {
+ switch (c.unicode()) {
+ case '\t':
+ case '\n':	res += " ";	continue;
+
+ case '\\':
+ case '/':	res += "-";	continue;
+
+ case ':':
+ case '*': res += "_"; continue;
+
+ case '<': res += "[";	continue;
+ case '>': res += "]";	continue;
+
+ case '?':
+ continue;
+
+ case '"': res += "'"; continue;
+ }
+
+ if (c <= 31)
+ continue;
+
+ res += c;
+ }
+
+
+ if (res == ".")
+ return "_";
+
+ if (res == "..")
+ return "__";
+
 return res;
 }

Changes of Revision 30