Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 25

flacon.changes Changed

flacon.spec Changed

flacon-4.1.0.tar.gz/tagset.cpp Deleted

@@ -1,384 +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 "tagset.h"
-#include "settings.h"
-#include <QTextCodec>
-#include <QSharedData>
-#include <QDebug>
-
-#include <uchardet.h>
-
-#define ENC_CODEC "UTF-8"
-
-class Tag
-{
-public:
- Tag(const QByteArray &val="", bool enc = false):
- value(val),
- encoded(enc)
- {
- }
-
- QByteArray value;
- bool encoded;
-};
-
-
-class TagSetData: public QSharedData
-{
-public:
- TagSetData();
- Tag mFileTag;
- int mTrackCount;
- mutable QTextCodec *mTextCodec;
- QString mTextCodecName;
- QString mUri;
- QHash<QString, Tag> mTags;
-
- inline QString key(int track, const QString &tagName) const;
- QString decode(const Tag &tag) const;
-};
-
-
-/************************************************
-
- ************************************************/
-QString TagSetData::key(int track, const QString &tagName) const
-{
- return QString("%1:%2").arg(track).arg(tagName.toUpper());
-}
-
-
-/************************************************
-
- ************************************************/
-QString TagSetData::decode(const Tag &tag) const
-{
- if (tag.encoded)
- return QTextCodec::codecForName(ENC_CODEC)->toUnicode(tag.value);
-
- if (!mTextCodec)
- {
- // Auto detect codepage ...........................
- uchardet_t uc = uchardet_new();
-
- for(int i=0; i<mTrackCount; ++i)
- {
- const QByteArray &performer = mTags.value(key(i, TAG_PERFORMER)).value;
- const QByteArray &title = mTags.value(key(i, TAG_TITLE)).value;
-
- uchardet_handle_data(uc, performer.data(), performer.length());
- uchardet_handle_data(uc, title.data(), title.length());
- }
-
- uchardet_data_end(uc);
- mTextCodec = QTextCodec::codecForName(uchardet_get_charset(uc));
- if (!mTextCodec)
- mTextCodec = QTextCodec::codecForName("UTF-8");
-
- uchardet_delete(uc);
- }
-
- return mTextCodec->toUnicode(tag.value);
-}
-
-
-/************************************************
-
- ************************************************/
-TagSetData::TagSetData():
- mTrackCount(0),
- mTextCodec(0)
-{
-}
-
-
-/************************************************
-
- ************************************************/
-TagSet::TagSet(const QString &uri):
- d(new TagSetData)
-{
- d->mUri = uri;
- setTextCodecName(settings->value(Settings::Tags_DefaultCodepage).toString());
-}
-
-
-/************************************************
-
- ************************************************/
-TagSet::TagSet(const TagSet &other):
- d(other.d)
-{
-}
-
-
-/************************************************
-
- ************************************************/
-TagSet::~TagSet()
-{
-}
-
-
-/************************************************
-
- ************************************************/
-TagSet &TagSet::operator =(const TagSet &other)
-{
- d = other.d;
- return *this;
-}
-
-
-/************************************************
-
- ************************************************/
-QString TagSet::uri() const
-{
- return d->mUri;
-}
-
-
-/************************************************
-
- ************************************************/
-QString TagSet::title() const
-{
- return diskTag("FLACON_TAGSET_TITLE");
-}
-
-
-/************************************************
-
- ************************************************/
-void TagSet::setTitle(const QString &title)
-{
- setTitle(QTextCodec::codecForName(ENC_CODEC)->fromUnicode(title), true);
-}
-
-
-/************************************************
-
- ************************************************/
-void TagSet::setTitle(const QByteArray &title, bool encoded)
-{
- setDiskTag("FLACON_TAGSET_TITLE", title, encoded);
-}
-
-
-/************************************************
-
- ************************************************/
-int TagSet::tracksCount() const
-{
- return d->mTrackCount;

flacon-4.1.0.tar.gz/tagset.h Deleted

@@ -1,114 +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 TAGSET_H
-#define TAGSET_H
-
-#include <QtCore/QSharedDataPointer>
-#include <QString>
-#include <QList>
-#include <QHash>
-#include <QAction>
-
-class TagSetData;
-class QTextCodec;
-
-#define TAG_ALBUM "ALBUM"
-#define TAG_CATALOG "CATALOG"
-#define TAG_CDTEXTFILE "CDTEXTFILE"
-#define TAG_COMMENT "COMMENT"
-#define TAG_DATE "DATE"
-#define TAG_FLAGS "FLAGS"
-#define TAG_GENRE "GENRE"
-#define TAG_ISRC "ISRC"
-#define TAG_PERFORMER "PERFORMER"
-#define TAG_SONGWRITER "SONGWRITER"
-#define TAG_TITLE "TITLE"
-#define TAG_DISCID "DISCID"
-#define TAG_FILE "FILE"
-#define TAG_DISKNUM "DISKNUM"
-#define TAG_CUE_FILE "CUE_FILE"
-#define START_TRACK_NUM "START_TRACK_NUM"
-
-#define CODEC_AUTODETECT "AUTODETECT"
-
-class TagSet
-{
-public:
- explicit TagSet(const QString &uri);
- TagSet(const TagSet &other);
- ~TagSet();
-
- TagSet &operator=(const TagSet &other);
-
- QString uri() const;
- QString title() const;
- void setTitle(const QString &title);
- void setTitle(const QByteArray &title, bool encoded);
-
- int tracksCount() const;
-
- QString textCodecName() const;
- void setTextCodecName(const QString codecName);
-
-
- QString trackTag(int track, const QString &tagName) const;
- void setTrackTag(int track, const QString &tagName, const QString &value);
- void setTrackTag(int track, const QString &tagName, const QByteArray &value, bool encoded);
-
-
- QString diskTag(const QString &tagName) const;
- void setDiskTag(const QString &tagName, const QString &value);
- void setDiskTag(const QString &tagName, const QByteArray &value, bool encoded);
-
- int distance(const TagSet &other);
- int distance(const TagSet *other);
-
-private:
- QSharedDataPointer<TagSetData> d;
-};
-
-class Disk;
-
-class TagSetAction: public QAction
-{
- Q_OBJECT
-public:
- TagSetAction(QObject* parent, Disk *disk, TagSet *tagSet);
- TagSetAction(const QString &text, QObject* parent, Disk *disk, TagSet *tagSet);
- TagSetAction(const QIcon &icon, const QString &text, QObject* parent, Disk *disk, TagSet *tagSet);
-
- TagSet *tagSet() const { return mTagSet; }
- Disk *disk() const { return mDisk; }
-private:
- Disk *mDisk;
- TagSet *mTagSet;
-};
-
-
-QDebug operator<<(QDebug dbg, const TagSet &ts);
-
-#endif // TAGSET_H

flacon-4.1.0.tar.gz/CMakeLists.txt -> flacon-5.0.0.tar.gz/CMakeLists.txt Changed

@@ -31,10 +31,15 @@
 
 project(flacon)
 
-set(MAJOR_VERSION 4)
-set(MINOR_VERSION 1)
+set(MAJOR_VERSION 5)
+set(MINOR_VERSION 0)
 set(PATCH_VERSION 0)
+#set(BETA_VERSION beta2)
+
 set(FLACON_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})
+if (BETA_VERSION)
+    set(FLACON_VERSION ${FLACON_VERSION}-${BETA_VERSION})
+endif()
 
 add_definitions(-DFLACON_MAJOR_VERSION=\"${MAJOR_VERSION}\")
 add_definitions(-DFLACON_MINOR_VERSION=\"${MINOR_VERSION}\")
@@ -49,7 +54,7 @@
 set(HEADERS
     application.h
     types.h
-    tagset.h
+    tags.h
     cue.h
     track.h
     disk.h
@@ -70,6 +75,7 @@
     gui/cuediskselectdialog/cuediskselectdialog.h
     gui/coverdialog/coverdialog.h
     gui/coverdialog/asynclistwidgetitem.h
+    gui/tageditor/tageditor.h
 
     converter/wavheader.h
     converter/decoder.h
@@ -81,6 +87,7 @@
     converter/diskpipline.h
     converter/cuecreator.h
     converter/copycover.h
+    converter/resampler.h
 
     formats/format.h
     formats/outformat.h
@@ -98,7 +105,7 @@
 set(SOURCES
     application.cpp
     types.cpp
-    tagset.cpp
+    tags.cpp
     cue.cpp
     main.cpp
     track.cpp
@@ -120,6 +127,7 @@
     gui/cuediskselectdialog/cuediskselectdialog.cpp
     gui/coverdialog/coverdialog.cpp
     gui/coverdialog/asynclistwidgetitem.cpp
+    gui/tageditor/tageditor.cpp
 
     converter/wavheader.cpp
     converter/decoder.cpp
@@ -131,6 +139,7 @@
     converter/diskpipline.cpp
     converter/cuecreator.cpp
     converter/copycover.cpp
+    converter/resampler.cpp
 
     formats/format.cpp
     formats/outformat.cpp

flacon-4.1.0.tar.gz/cmake/tests.cmake -> flacon-5.0.0.tar.gz/cmake/tests.cmake Changed

flacon-4.1.0.tar.gz/converter/converter.cpp -> flacon-5.0.0.tar.gz/converter/converter.cpp Changed

@@ -35,6 +35,7 @@
 #include "encoder.h"
 #include "gain.h"
 #include "diskpipline.h"
+#include "resampler.h"
 
 #include <iostream>
 #include <math.h>
@@ -99,6 +100,9 @@
 connect(pipeline, SIGNAL(threadFinished()),
 this, SLOT(startThread()));
 
+ connect(pipeline, &DiskPipeline::trackProgressChanged,
+ this, &Converter::trackProgress);
+
 mDiskPiplines << pipeline;
 
 if (!pipeline->init())
@@ -206,6 +210,16 @@
 QStringList errors;
 bool ok = format->check(&errors);
 
+ if (settings->value(Settings::Resample_BitsPerSample).toInt() ||
+ settings->value(Settings::Resample_SampleRate).toInt() )
+ {
+ if (!settings->checkProgram(Resampler::programName()))
+ {
+ errors << QObject::tr("I can't find program %1.").arg(Resampler::programName());
+ ok = false;
+ }
+ }
+
 if (!ok)
 {
 QString s;
@@ -214,7 +228,7 @@
 s += QString("<li style='margin-top: 4px;'> %1</li>").arg(e);
 }
 
- Project::error(QString("<html>%1<ul>%2</ul></html>")
+ Messages::error(QString("<html>%1<ul>%2</ul></html>")
 .arg(tr("Conversion is not possible:"), s));
 }

flacon-4.1.0.tar.gz/converter/converter.h -> flacon-5.0.0.tar.gz/converter/converter.h Changed

flacon-4.1.0.tar.gz/converter/copycover.cpp -> flacon-5.0.0.tar.gz/converter/copycover.cpp Changed

@@ -78,6 +78,15 @@
 if (!res)
 mErrorString = QObject::tr("I can't copy cover file %1: %2").arg(outFileName, f.errorString());
 
+ const QFileDevice::Permissions perm = QFileDevice::ReadOwner | QFileDevice::WriteOwner |
+ QFileDevice::ReadUser | QFileDevice::WriteUser |
+ QFileDevice::ReadGroup | QFileDevice::WriteGroup |
+ QFileDevice::ReadOther ;
+
+ res = QFile::setPermissions(outFileName, perm);
+ if (!res)
+ mErrorString = QObject::tr("I can't copy cover file %1: %2").arg(outFileName, f.errorString());
+
 return res;
 }
 
@@ -107,7 +116,7 @@
 QImageWriter writer(outFileName);
 if (!writer.write(img))
 {
- mErrorString = QObject::tr("I can't write cover image %1: %2",
+ mErrorString = QObject::tr("I can't save cover image %1: %2",
 "%1 - is file name, %2 - an error text")
 .arg(outFileName)
 .arg(writer.errorString());

flacon-4.1.0.tar.gz/converter/cuecreator.cpp -> flacon-5.0.0.tar.gz/converter/cuecreator.cpp Changed

@@ -72,26 +72,36 @@
 ************************************************/
 void CueCreator::initGlobalTags()
 {
- QStringList tagNames;
- tagNames << TAG_GENRE;
- tagNames << TAG_DATE;
- tagNames << TAG_PERFORMER;
- tagNames << TAG_SONGWRITER;
- tagNames << TAG_ALBUM;
+ static TagId tags[] = {
+ TagId::Genre,
+ TagId::Date,
+ TagId::Artist,
+ TagId::SongWriter,
+ TagId::Album,
+ TagId::Catalog,
+ TagId::CDTextfile,
+ TagId::DiscId
+ };
+
+ mGlobalTags.setCodecName(mTextCodec->name());
 
 Track *firstTrack = mDisk->track(0);
-
- foreach(QString tagName, tagNames)
+ for (uint t=0; t<sizeof(tags)/sizeof(TagId); ++t)
 {
- QString value = firstTrack->tag(tagName);
+ TagId tagId = tags[t];
+ QString value = firstTrack->tag(tagId);
 
 for (int i=1; i<mDisk->count(); ++i)
 {
- if (mDisk->track(i)->tag(tagName) != value)
+ if (mDisk->track(i)->tag(tagId) != value)
+ {
 value = "";
+ break;
+ }
 }
 
- mGlobalTags.insert(tagName, value);
+ if (!value.isEmpty())
+ mGlobalTags.setTag(tagId, value);
 }
 }
 
@@ -106,24 +116,13 @@
 }
 
 
-/************************************************
-
- ************************************************/
-void CueCreator::writeDiskTag(const QString &format, const QString &tagName)
-{
- QString value = mDisk->tag(tagName);
-
- if (!value.isEmpty())
- writeLine(format.arg(value));
-}
-
 
 /************************************************
 
 ************************************************/
-void CueCreator::writeGlobalTag(const QString &format, const QString &tagName)
+void CueCreator::writeGlobalTag(const QString &format, TagId tagId)
 {
- QString value = mGlobalTags.value(tagName);
+ QString value = mGlobalTags.tag(tagId);
 
 if (!value.isEmpty())
 writeLine(format.arg(value));
@@ -133,11 +132,11 @@
 /************************************************
 
 ************************************************/
-void CueCreator::writeTrackTag(const Track *track, const QString &prefix, const QString &tagName)
+void CueCreator::writeTrackTag(const Track *track, const QString &prefix, TagId tagId)
 {
- QString value = track->tag(tagName);
+ QString value = track->tag(tagId);
 
- if (!value.isEmpty() && value != mGlobalTags.value(tagName))
+ if (!value.isEmpty() && value != mGlobalTags.tag(tagId))
 writeLine(prefix.arg(value));
 }
 
@@ -152,22 +151,22 @@
 
 if (!mFile.open(QIODevice::WriteOnly | QIODevice::Text))
 {
- mErrorString = QObject::tr("I can't write cue file %1: %2").arg(mFile.fileName(), mFile.errorString());
+ mErrorString = QObject::tr("I can't write CUE file %1: %2").arg(mFile.fileName(), mFile.errorString());
 return false;
 }
 
 initGlobalTags();
 
 // Common ...........................
- writeDiskTag("CATALOG %1", TAG_CATALOG);
- writeDiskTag("CDTEXTFILE \"%1\"", TAG_CDTEXTFILE);
- writeGlobalTag("REM GENRE \"%1\"", TAG_GENRE);
- writeGlobalTag("REM DATE %1", TAG_DATE);
- writeDiskTag("REM DISCID %1", TAG_DISCID);
+ writeGlobalTag("CATALOG %1", TagId::Catalog);
+ writeGlobalTag("CDTEXTFILE \"%1\"", TagId::CDTextfile);
+ writeGlobalTag("REM GENRE \"%1\"", TagId::Genre);
+ writeGlobalTag("REM DATE %1", TagId::Date);
+ writeGlobalTag("REM DISCID %1", TagId::DiscId);
 writeLine(QString("REM COMMENT \"Flacon v%1\"").arg(FLACON_VERSION));
- writeGlobalTag("PERFORMER \"%1\"", TAG_PERFORMER);
- writeGlobalTag("SONGWRITER \"%1\"", TAG_SONGWRITER);
- writeGlobalTag("TITLE \"%1\"", TAG_ALBUM);
+ writeGlobalTag("PERFORMER \"%1\"", TagId::Artist);
+ writeGlobalTag("SONGWRITER \"%1\"", TagId::SongWriter);
+ writeGlobalTag("TITLE \"%1\"", TagId::Album);
 
 if (createPreGapFile)
 writeLine(QString("FILE \"%1\" WAVE").arg(QFileInfo(mDisk->preGapTrack()->resultFilePath()).fileName()));
@@ -184,9 +183,9 @@
 
 writeLine(QString(" TRACK %1 AUDIO").arg(i + 1, 2, 10, QChar('0')));
 
- writeTrackTag(track, " FLAGS %1", TAG_FLAGS);
- writeTrackTag(track, " ISRC %1", TAG_ISRC);
- writeTrackTag(track, " TITLE \"%1\"", TAG_TITLE);
+ writeTrackTag(track, " FLAGS %1", TagId::Flags);
+ writeTrackTag(track, " ISRC %1", TagId::ISRC);
+ writeTrackTag(track, " TITLE \"%1\"", TagId::Title);
 
 if( i == 0)
 {
@@ -213,10 +212,10 @@
 
 }
 
- writeTrackTag(track, " REM GENRE \"%1\"", TAG_GENRE);
- writeTrackTag(track, " REM DATE %1", TAG_DATE);
- writeTrackTag(track, " PERFORMER \"%1\"", TAG_PERFORMER);
- writeTrackTag(track, " SONGWRITER \"%1\"", TAG_SONGWRITER);
+ writeTrackTag(track, " REM GENRE \"%1\"", TagId::Genre);
+ writeTrackTag(track, " REM DATE %1", TagId::Date);
+ writeTrackTag(track, " PERFORMER \"%1\"", TagId::Artist);
+ writeTrackTag(track, " SONGWRITER \"%1\"", TagId::SongWriter);
 }
 
 mFile.close();

flacon-4.1.0.tar.gz/converter/cuecreator.h -> flacon-5.0.0.tar.gz/converter/cuecreator.h Changed

flacon-4.1.0.tar.gz/converter/decoder.cpp -> flacon-5.0.0.tar.gz/converter/decoder.cpp Changed

flacon-4.1.0.tar.gz/converter/decoder.h -> flacon-5.0.0.tar.gz/converter/decoder.h Changed

flacon-4.1.0.tar.gz/converter/diskpipline.cpp -> flacon-5.0.0.tar.gz/converter/diskpipline.cpp Changed

@@ -25,6 +25,9 @@
 
 
 #include "diskpipline.h"
+
+#include <QUuid>
+
 #include "splitter.h"
 #include "encoder.h"
 #include "gain.h"
@@ -33,7 +36,7 @@
 #include "project.h"
 #include "settings.h"
 #include "outformat.h"
-
+#include "inputaudiofile.h"
 
 #include <QThread>
 #include <QDebug>
@@ -98,17 +101,18 @@
 const Disk *disk;
 QList<const Track*> tracks;
 bool needStartSplitter;
- QHash<const Track*, Track::Status> trackStatuses;
- QList<WorkerRequest> encoderRequests;
+ QHash<const Track*, TrackState> trackStates;
+ QList<EncoderRequest> encoderRequests;
 QList<WorkerRequest> gainRequests;
 bool interrupted;
 QString workDir;
+ QString tmpFilePrefix;
 PreGapType preGapType;
 
 
- void interrupt(Track::Status status);
+ void interrupt(TrackState state);
 void startSplitterThread();
- void startEncoderThread(const WorkerRequest &req);
+ void startEncoderThread(const EncoderRequest &req);
 void startTrackGainThread(const WorkerRequest &req);
 void startAlbumGainThread(QList<WorkerRequest> &reqs);
 bool createDir(const QString &dirName) const;
@@ -127,13 +131,13 @@
 
 if (! dir.mkpath("."))
 {
- Project::error(QObject::tr("I can't create directory \"%1\".").arg(dir.path()));
+ Messages::error(QObject::tr("I can't create directory \"%1\".").arg(dir.path()));
 return false;
 }
 
 if (!QFileInfo(dir.path()).isWritable())
 {
- Project::error(QObject::tr("I can't write to directory \"%1\".").arg(dir.path()));
+ Messages::error(QObject::tr("I can't write to directory \"%1\".").arg(dir.path()));
 return false;
 }
 
@@ -152,9 +156,6 @@
 mData->pipeline = this;
 mData->disk = disk;
 mData->preGapType = settings->createCue() ? settings->preGapType() : PreGapType::Skip;
-
-
-
 }
 
 
@@ -163,6 +164,14 @@
 ************************************************/
 DiskPipeline::~DiskPipeline()
 {
+ // Remove temporary files
+ QDir dir(QFileInfo(mData->tmpFilePrefix).dir());
+ QStringList filters;
+ filters << QFileInfo(mData->tmpFilePrefix).fileName() + "*";
+
+ foreach (const QString &file, dir.entryList(filters, QDir::Files))
+ dir.remove(file);
+
 delete mData;
 delete mTmpDir;
 }
@@ -184,12 +193,17 @@
 else
 mData->workDir = QFileInfo(mData->disk->track(0)->resultFilePath()).dir().absolutePath();
 
- Splitter splitter(mData->disk, mData->workDir, mData->preGapType);
+ mData->tmpFilePrefix = QDir::toNativeSeparators(QString("%1/flacon_%2-")
+ .arg(mData->workDir)
+ .arg(QUuid::createUuid().toString().mid(1, 36)));
+
+
+ Splitter splitter(mData->disk, mData->tmpFilePrefix, mData->preGapType);
 mData->tracks = splitter.tracks();
 
 foreach (const Track *track, mData->tracks)
 {
- mData->trackStatuses.insert(track, Track::NotRunning);
+ mData->trackStates.insert(track, TrackState::NotRunning);
 }
 
 if (!mData->createDir(mData->workDir))
@@ -297,7 +311,7 @@
 bool res = copyCover.run();
 
 if (!res)
- Project::error(copyCover.errorString());
+ Messages::error(copyCover.errorString());
 
 return res;
 }
@@ -308,15 +322,15 @@
 ************************************************/
 void DiskPipeline::Data::startSplitterThread()
 {
- Splitter *worker = new Splitter(disk, workDir, preGapType);
+ Splitter *worker = new Splitter(disk, tmpFilePrefix, preGapType);
 
 WorkerThread *thread = new WorkerThread(worker, pipeline);
 
 connect(pipeline, SIGNAL(threadQuit()),
 thread, SLOT(terminate()));
 
- connect(worker, SIGNAL(trackProgress(const Track*,Track::Status,int)),
- pipeline, SLOT(trackProgress(const Track*,Track::Status,int)));
+ connect(worker, SIGNAL(trackProgress(const Track*,TrackState,int)),
+ pipeline, SLOT(trackProgress(const Track*,TrackState,int)));
 
 connect(worker, SIGNAL(error(const Track*,QString)),
 pipeline, SLOT(trackError(const Track*,QString)));
@@ -331,7 +345,7 @@
 thread->start();
 
 needStartSplitter = false;
- trackStatuses.insert(disk->track(0), Track::Splitting);
+ trackStates.insert(disk->track(0), TrackState::Splitting);
 
 createCue();
 copyCoverImage();
@@ -341,16 +355,16 @@
 /************************************************
 *
 ************************************************/
-void DiskPipeline::Data::startEncoderThread(const WorkerRequest &req)
+void DiskPipeline::Data::startEncoderThread(const EncoderRequest &req)
 {
- Encoder *worker = new Encoder(req, settings->outFormat());
+ Encoder *worker = new Encoder(req);
 WorkerThread *thread = new WorkerThread(worker, pipeline);
 
 connect(pipeline, SIGNAL(threadQuit()),
 thread, SLOT(terminate()));
 
- connect(worker, SIGNAL(trackProgress(const Track*,Track::Status,int)),
- pipeline, SLOT(trackProgress(const Track*,Track::Status,int)));
+ connect(worker, SIGNAL(trackProgress(const Track*,TrackState,int)),
+ pipeline, SLOT(trackProgress(const Track*,TrackState,int)));
 
 connect(worker, SIGNAL(error(const Track*,QString)),
 pipeline, SLOT(trackError(const Track*,QString)));
@@ -385,8 +399,8 @@
 connect(pipeline, SIGNAL(threadQuit()),
 thread, SLOT(terminate()));
 
- connect(worker, SIGNAL(trackProgress(const Track*,Track::Status,int)),
- pipeline, SLOT(trackProgress(const Track*,Track::Status,int)));
+ connect(worker, SIGNAL(trackProgress(const Track*,TrackState,int)),
+ pipeline, SLOT(trackProgress(const Track*,TrackState,int)));
 
 connect(worker, SIGNAL(error(const Track*,QString)),
 pipeline, SLOT(trackError(const Track*,QString)));
@@ -413,8 +427,8 @@
 connect(pipeline, SIGNAL(threadQuit()),
 thread, SLOT(terminate()));
 
- connect(worker, SIGNAL(trackProgress(const Track*,Track::Status,int)),
- pipeline, SLOT(trackProgress(const Track*,Track::Status,int)));
+ connect(worker, SIGNAL(trackProgress(const Track*,TrackState,int)),
+ pipeline, SLOT(trackProgress(const Track*,TrackState,int)));
 
 connect(worker, SIGNAL(error(const Track*,QString)),
 pipeline, SLOT(trackError(const Track*,QString)));
@@ -433,16 +447,47 @@
 /************************************************
 *
 ************************************************/
+int DiskPipeline::calcQuality(int input, int preferences, int formatMax)
+{
+
+ int min = qMin(qMin(input, formatMax),
+ (preferences ? preferences : std::numeric_limits<int>::max()));
+
+ if (min < input)
+ return min;
+ else
+ return 0;
+}
+
+

flacon-4.1.0.tar.gz/converter/diskpipline.h -> flacon-5.0.0.tar.gz/converter/diskpipline.h Changed

flacon-4.1.0.tar.gz/converter/encoder.cpp -> flacon-5.0.0.tar.gz/converter/encoder.cpp Changed

@@ -26,6 +26,8 @@
 
 #include "encoder.h"
 #include "outformat.h"
+#include "settings.h"
+#include "resampler.h"
 
 #include <QFileInfo>
 #include <QDir>
@@ -37,10 +39,9 @@
 /************************************************
 *
 ************************************************/
-Encoder::Encoder(const WorkerRequest request, const OutFormat *format, QObject *parent):
+Encoder::Encoder(const EncoderRequest &request, QObject *parent):
 Worker(parent),
 mRequest(request),
- mFormat(format),
 mTotal(0),
 mReady(0),
 mProgress(0)
@@ -50,50 +51,127 @@
 
 
 /************************************************
+ *
+ ************************************************/
+void Encoder::check(QProcess *process)
+{
+ if (process->exitCode() != 0)
+ {
+ QTextStream(stderr) << "Encoder command: ";
+ debugArguments(process->program(), process->arguments());
+ QString msg = tr("Encoder error:\n") + "<pre>" +
+ QString::fromLocal8Bit(process->readAllStandardError()) +
+ "</pre>";
+ error(mRequest.track, msg);
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void Encoder::runOneProcess(QProcess *process)
+{
+ connect(process, &QProcess::bytesWritten, this, &Encoder::processBytesWritten);
+
+ process->start();
+ readInputFile(process);
+ process->closeWriteChannel();
+ process->waitForFinished(-1);
+ check(process);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void Encoder::runTwoProcess(QProcess *resampler, QProcess *encoder)
+{
+ resampler->setStandardOutputProcess(encoder);
+
+ connect(resampler, &QProcess::bytesWritten, this, &Encoder::processBytesWritten);
+
+ resampler->start();
+ encoder->start();
+
+ readInputFile(resampler);
+ resampler->closeWriteChannel();
+ resampler->waitForFinished(-1);
+ check(resampler);
+
+ encoder->closeWriteChannel();
+ encoder->waitForFinished(-1);
+ check(encoder);
+}
+
+
+/************************************************
 
 ************************************************/
 void Encoder::run()
 {
- emit trackProgress(mRequest.track(), Track::Encoding, 0);
+ emit trackProgress(mRequest.track, TrackState::Encoding, 0);
 bool debug = QProcessEnvironment::systemEnvironment().contains("FLACON_DEBUG_ENCODER");
 
- // Input file already WAV, so for WAV output format we just rename file.
- if (mFormat->id() == "WAV")
+ const qint8 COPY_FILE=0, RESAMPLE=1, ENCODE=2, RESAMPLE_ENCODE=3;
+
+ QProcess resampler;
+ QProcess encoder;
+ qint8 mode = COPY_FILE;
+
+ if (mRequest.format->id() != "WAV")
 {
- runWav();
- return;
- }
+ QStringList args = mRequest.format->encoderArgs(mRequest.track, QDir::toNativeSeparators(mRequest.outFile));
+ QString prog = args.takeFirst();
 
- QProcess process;
- QStringList args = mFormat->encoderArgs(mRequest.track(), QDir::toNativeSeparators(mRequest.outFile()));
- QString prog = args.takeFirst();
+ if (debug)
+ debugArguments(prog, args);
 
- if (debug)
- debugArguments(prog, args);
+ encoder.setProgram(prog);
+ encoder.setArguments(args);
+ mode += ENCODE;
+ }
 
- connect(&process, SIGNAL(bytesWritten(qint64)),
- this, SLOT(processBytesWritten(qint64)));
+ if (mRequest.bitsPerSample || mRequest.sampleRate)
+ {
+ QString outFile;
+ if (mode == COPY_FILE)
+ outFile = mRequest.outFile; // Input file already WAV, so for WAV output format we just rename file.
+ else
+ outFile = "-"; // Write to STDOUT
 
- process.start(QDir::toNativeSeparators(prog), args);
- process.waitForStarted();
+ QStringList args = Resampler::args(mRequest.bitsPerSample, mRequest.sampleRate, outFile);
+ QString prog = args.takeFirst();
 
- readInputFile(&process);
- process.closeWriteChannel();
+ if (debug)
+ debugArguments(prog, args);
 
- process.waitForFinished(-1);
- if (process.exitCode() != 0)
- {
- QTextStream(stderr) << "Encoder command: ";
- debugArguments(prog, args);
- QString msg = tr("Encoder error:\n") + "<pre>" +
- QString::fromLocal8Bit(process.readAllStandardError()) +
- "</pre>";
- error(mRequest.track(), msg);
+ resampler.setProgram(prog);
+ resampler.setArguments(args);
+ mode += RESAMPLE;
 }
 
- deleteFile(mRequest.inputFile());
+ switch (mode)
+ {
+ case COPY_FILE:
+ runWav();
+ return;
+
+ case RESAMPLE:
+ runOneProcess(&resampler);
+ break;
+
+ case ENCODE:
+ runOneProcess(&encoder);
+ break;
+
+ case RESAMPLE_ENCODE:
+ runTwoProcess(&resampler, &encoder);
+ break;
+ }
 
- emit trackReady(mRequest.track(), mRequest.outFile());
+ deleteFile(mRequest.inputFile);
+ emit trackReady(mRequest.track, mRequest.outFile);
 }
 
 
@@ -107,7 +185,7 @@
 if (p != mProgress)
 {
 mProgress = p;
- emit trackProgress(mRequest.track(), Track::Encoding, mProgress);
+ emit trackProgress(mRequest.track, TrackState::Encoding, mProgress);
 }
 }
 
@@ -117,10 +195,10 @@
 ************************************************/
 void Encoder::readInputFile(QProcess *process)
 {
- QFile file(mRequest.inputFile());
+ QFile file(mRequest.inputFile);
 if (!file.open(QFile::ReadOnly))
 {
- error(mRequest.track(), tr("I can't read %1 file", "Encoder error. %1 is a file name.").arg(mRequest.inputFile()));
+ error(mRequest.track, tr("I can't read %1 file", "Encoder error. %1 is a file name.").arg(mRequest.inputFile));
 }
 
 mProgress = -1;
@@ -142,18 +220,18 @@

flacon-4.1.0.tar.gz/converter/encoder.h -> flacon-5.0.0.tar.gz/converter/encoder.h Changed

@@ -34,11 +34,21 @@
 class QProcess;
 class OutFormat;
 
+struct EncoderRequest
+{
+    const Track *track;
+    QString      inputFile;
+    QString      outFile;
+    int          bitsPerSample;
+    int          sampleRate;
+    OutFormat   *format;
+};
+
 class Encoder: public Worker
 {
     Q_OBJECT
 public:
-    Encoder(const WorkerRequest request, const OutFormat *format, QObject *parent = 0);
+    Encoder(const EncoderRequest &request, QObject *parent = 0);
 
     QString outFile() const { return mOutFile; }
 
@@ -53,8 +63,7 @@
 
 
 private:
-    const WorkerRequest mRequest;
-    const OutFormat *mFormat;
+    const EncoderRequest mRequest;
     QString mOutFile;
     quint64 mTotal;
     quint64 mReady;
@@ -62,6 +71,10 @@
 
     void readInputFile(QProcess *process);
     void runWav();
+    void initResampler(QProcess *process, const QString &outFile, bool debug);
+    void check(QProcess *process);
+    void runOneProcess(QProcess *process);
+    void runTwoProcess(QProcess *resampler, QProcess *encoder);
 };
 
 #endif // ENCODER_H

flacon-4.1.0.tar.gz/converter/gain.cpp -> flacon-5.0.0.tar.gz/converter/gain.cpp Changed

flacon-5.0.0.tar.gz/converter/resampler.cpp Added

@@ -0,0 +1,61 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2018
+ * 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 "resampler.h"
+#include "settings.h"
+
+#include <QDir>
+
+Resampler::Resampler()
+{
+
+}
+
+QStringList Resampler::args(int bitsPerSample, int sampleRate, const QString &outFile)
+{
+ QString prog = settings->programName(programName());
+ QStringList args;
+ args << QDir::toNativeSeparators(prog);
+
+ args << "-"; // Read from STDIN
+ if (bitsPerSample)
+ {
+ args << "-b" << QString("%1").arg(bitsPerSample);
+ }
+
+ args << "--type" << "wav";
+ args << outFile; // Input file already WAV, so for WAV output format we just rename file.
+
+ if (sampleRate)
+ {
+ args << "rate";
+ args << "-v"; // very high quality
+ args << QString("%1").arg(sampleRate);
+ }
+
+ return args;
+}
+

flacon-5.0.0.tar.gz/converter/resampler.h Added

@@ -0,0 +1,41 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2018
+ * 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 RESAMPLER_H
+#define RESAMPLER_H
+
+#include <QProcess>
+
+class Resampler
+{
+public:
+ explicit Resampler();
+
+ static QString programName() { return "sox"; }
+ static QStringList args(int bitsPerSample, int sampleRate, const QString &outFile);
+};
+
+#endif // RESAMPLER_H

flacon-4.1.0.tar.gz/converter/splitter.cpp -> flacon-5.0.0.tar.gz/converter/splitter.cpp Changed

@@ -28,18 +28,16 @@
 #include "disk.h"
 #include "decoder.h"
 
-#include <QDir>
-#include <QUuid>
 #include <QDebug>
 
 
 /************************************************
 *
 ************************************************/
-Splitter::Splitter(const Disk *disk, const QString &workDir, PreGapType preGapType, QObject *parent):
+Splitter::Splitter(const Disk *disk, const QString &tmpFilePrefix, PreGapType preGapType, QObject *parent):
 Worker(parent),
 mDisk(disk),
- mWorkDir(workDir),
+ mTmpFilePrefix(tmpFilePrefix),
 mPreGapType(preGapType),
 mCurrentTrack(NULL)
 {
@@ -74,7 +72,7 @@
 mCurrentTrack = mDisk->preGapTrack();
 CueIndex start = mDisk->track(0)->cueIndex(0);
 CueIndex end = mDisk->track(0)->cueIndex(1);
- QString outFileName = tmpFileName(mWorkDir, 0);
+ QString outFileName = QString("%1%2.wav").arg(mTmpFilePrefix).arg(0, 2, 10, QLatin1Char('0'));
 
 try
 {
@@ -101,7 +99,7 @@
 for (int i=0; i<mDisk->count(); ++i)
 {
 mCurrentTrack = mDisk->track(i);
- QString outFileName = tmpFileName(mWorkDir, i + 1);
+ QString outFileName = QString("%1%2.wav").arg(mTmpFilePrefix).arg(i+1, 2, 10, QLatin1Char('0'));
 
 CueIndex start, end;
 if (i==0 && mPreGapType == PreGapType::AddToFirstTrack)
@@ -149,21 +147,5 @@
 ************************************************/
 void Splitter::decoderProgress(int percent)
 {
- emit trackProgress(mCurrentTrack, Track::Splitting, percent);
+ emit trackProgress(mCurrentTrack, TrackState::Splitting, percent);
 }
-
-
-/************************************************
- *
- ************************************************/
-QString Splitter::tmpFileName(const QString &dir, int trackNum)
-{
- return QDir::toNativeSeparators(QString("%1/flacon_%2_[%3].wav")
- .arg(dir)
- .arg(trackNum, 2, 10, QChar('0'))
- .arg(QUuid::createUuid().toString().mid(1, 36)));
-}
-
-
-
-

flacon-4.1.0.tar.gz/converter/splitter.h -> flacon-5.0.0.tar.gz/converter/splitter.h Changed

flacon-4.1.0.tar.gz/converter/worker.cpp -> flacon-5.0.0.tar.gz/converter/worker.cpp Changed

@@ -53,29 +53,6 @@
 /************************************************
 
 ************************************************/
-bool Worker::createDir(const QString &dirName) const
-{
- QDir dir(dirName);
-
- if (! dir.mkpath("."))
- {
- Project::error(tr("I can't create directory \"%1\".").arg(dir.path()));
- return false;
- }
-
- if (!QFileInfo(dir.path()).isWritable())
- {
- Project::error(tr("I can't write to directory \"%1\".").arg(dir.path()));
- return false;
- }
-
- return true;
-}
-
-
-/************************************************
-
- ************************************************/
 bool Worker::deleteFile(const QString &fileName) const
 {
 QFile f(fileName);
@@ -107,3 +84,28 @@
 }
 out << endl;
 }
+
+
+/************************************************
+ *
+ ************************************************/
+WorkerRequest::WorkerRequest(const WorkerRequest &other):
+ mTrack(other.mTrack),
+ mInputFile(other.mInputFile),
+ mOutFile(other.mOutFile)
+{
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+WorkerRequest &WorkerRequest::operator=(const WorkerRequest &other)
+{
+ mTrack = other.mTrack;
+ mInputFile = other.mInputFile;
+ mOutFile = other.mOutFile;
+
+ return *this;
+}

flacon-4.1.0.tar.gz/converter/worker.h -> flacon-5.0.0.tar.gz/converter/worker.h Changed

flacon-4.1.0.tar.gz/cue.cpp -> flacon-5.0.0.tar.gz/cue.cpp Changed

@@ -25,6 +25,8 @@
 
 
 #include "cue.h"
+#include "types.h"
+#include "tags.h"
 #include <QFile>
 #include <QFileInfo>
 #include <QObject>
@@ -33,10 +35,12 @@
 
 enum CueTagId
 {
+ CTAG_EMPTY,
 CTAG_UNKNOWN,
 CTAG_FILE,
 CTAG_TRACK,
- CTAG_INDEX,
+ CTAG_INDEX00,
+ CTAG_INDEX01,
 CTAG_DISCID,
 CTAG_CATALOG,
 CTAG_CDTEXTFILE,
@@ -52,54 +56,37 @@
 
 
 /************************************************
-
+ *
 ************************************************/
-QString cueIndexTagKey(int indexNum)
+CueDisk::CueDisk():
+ Tracks(),
+ mDiskCount(0),
+ mDiskNum(0)
 {
- return QString("CUE_INDEX:%1").arg(indexNum);
+
 }
 
 
 /************************************************
-
+ *
 ************************************************/
-CueIndex::CueIndex(const QString &str):
- mNull(true),
- mCdValue(0),
- mHiValue(0)
+static QByteArray unQuote(const QByteArray &line)
 {
- if (!str.isEmpty())
- mNull = !parse(str);
+ if (line.length() > 2 &&
+ (line.at(0) == '"' || line.at(0) == '\'') &&
+ line.at(0) == line.at(line.length()-1))
+ {
+ return line.mid(1, line.length() - 2);
+ }
+ return line;
 }
 
 
 /************************************************
-
+ *
 ************************************************/
-QString CueIndex::toString(bool cdQuality) const
+CueReader::CueReader()
 {
- if (cdQuality)
- {
- int min = mCdValue / (60 * 75);
- int sec = (mCdValue - min * 60 * 75) / 75;
- int frm = mCdValue - (min * 60 + sec) * 75;
-
- return QString("%1:%2:%3")
- .arg(min, 2, 10, QChar('0'))
- .arg(sec, 2, 10, QChar('0'))
- .arg(frm, 2, 10, QChar('0'));
- }
- else
- {
- int min = mHiValue / (60 * 1000);
- int sec = (mHiValue - min * 60 * 1000) / 1000;
- int msec = mHiValue - (min * 60 + sec) * 1000;
-
- return QString("%1:%2.%3")
- .arg(min, 2, 10, QChar('0'))
- .arg(sec, 2, 10, QChar('0'))
- .arg(msec, 3, 10, QChar('0'));
- }
 
 }
 
@@ -107,188 +94,182 @@
 /************************************************
 
 ************************************************/
-CueIndex CueIndex::operator -(const CueIndex &other) const
+static QByteArray extractFileFromFileTag(const QByteArray &value)
 {
- CueIndex res;
- res.mCdValue = this->mCdValue - other.mCdValue;
- res.mHiValue = this->mHiValue - other.mHiValue;
- res.mNull = false;
- return res;
+ int n = value.lastIndexOf(' ');
+ if (n>-1)
+ return unQuote(value.left(n));
+
+ return unQuote(value);
 }
 
 
 /************************************************
-
- ************************************************/
-bool CueIndex::operator ==(const CueIndex &other) const
+*
+************************************************/
+static void splitTitle(Track *track, char separator)
 {
- return this->mHiValue == other.mHiValue;
+ QByteArray b = track->tagData(TagId::Title);
+ int pos = b.indexOf(separator);
+ track->setTag(TagId::Artist, b.left(pos).trimmed());
+ track->setTag(TagId::Title, b.right(b.length() - pos - 1).trimmed());
 }
 
 
 /************************************************
-
+ *
 ************************************************/
-bool CueIndex::operator !=(const CueIndex &other) const
+typedef QHash<CueTagId, QByteArray> CueTags;
+
+inline CueTags &operator<<(CueTags &dest, const CueTags &src)
 {
- return this->mHiValue != other.mHiValue;
+ CueTags::const_iterator i;
+ for (i = src.constBegin(); i != src.constEnd(); ++i)
+ dest.insert(i.key(), i.value());
+
+ return dest;
 }
 
 
 /************************************************
-
+ *
 ************************************************/
-bool CueIndex::parse(const QString &str)
+struct CueData
 {
- QStringList sl = str.split(QRegExp("\\D"), QString::KeepEmptyParts);
-
- if (sl.length()<3)
- return false;
-
- bool ok;
- int min = sl[0].toInt(&ok);
- if (!ok)
- return false;
+ explicit CueData(const QString &fileName);
 
- int sec = sl[1].toInt(&ok);
- if (!ok)
- return false;
 
- int frm = sl[2].leftJustified(2, '0').toInt(&ok);
- if (!ok)
- return false;
+ CueTags globalTags;
+ QVector<CueTags> tracks;
+ QString codecName;
 
- int msec = sl[2].leftJustified(3, '0').toInt(&ok);
- if (!ok)
- return false;
 
- mCdValue = (min * 60 + sec) * 75 + frm;
- mHiValue = (min * 60 + sec) * 1000 + msec;
- return true;
-}
+private:
+ QString mFileName;
+ int mLineNum;
+ void parseLine(const QByteArray &line, CueTagId &tag, QByteArray &value) const;
+};
 
 
 /************************************************
 *
 ************************************************/
-QByteArray unQuote(const QByteArray &line)
-{
- if (line.length() > 2 &&
- (line.at(0) == '"' || line.at(0) == '\'') &&

flacon-4.1.0.tar.gz/cue.h -> flacon-5.0.0.tar.gz/cue.h Changed

@@ -29,79 +29,41 @@
 
 #include <QString>
 #include <QList>
-#include "tagset.h"
+#include "types.h"
+#include "track.h"
 
 class QFile;
 
-class CueIndex
+class CueDisk: public Tracks
 {
+ friend class CueReader;
 public:
- explicit CueIndex(const QString &str = "");
-
- bool isNull() const { return mNull; }
- QString toString(bool cdQuality = true) const;
-
- CueIndex operator-(const CueIndex &other) const;
- bool operator==(const CueIndex &other) const;
- bool operator!=(const CueIndex &other) const;
-
- uint milliseconds() const { return mHiValue; }
- uint frames() const { return mCdValue; }
+ CueDisk();
+ QString fileName() const { return mFileName; }
+ DiskNum diskCount() const { return mDiskCount; }
+ DiskNum diskNum() const { return mDiskNum; }
 
 private:
- bool mNull;
- int mCdValue;
- int mHiValue;
-
- bool parse(const QString &str);
+ QString mFileName;
+ DiskNum mDiskCount;
+ DiskNum mDiskNum;
 };
 
-typedef CueIndex CueTime;
 
-class CueTagSet: public TagSet
+typedef QVector<CueDisk> Cue;
+
+class CueReader
 {
 public:
- explicit CueTagSet(const QString &uri);
- CueTagSet(const CueTagSet &other);
-
- QString cueFileName() const;
- QString fileTag() const;
- CueIndex index(int track, int indexNum) const;
- bool isMultiFileCue() const;
- int diskNumInCue() const;
+ CueReader();
+ QVector<CueDisk> load(const QString &fileName) noexcept(false);
 };
 
 
-class CueReader
+class CueReaderError: public FlaconError
 {
 public:
- explicit CueReader(const QString &fileName);
-
- QString fileName() const { return mFileName; }
- CueTagSet disk(int index) const { return mDisks.at(index); }
- int diskCount() const { return mDisks.count(); }
- bool isMultiFileCue() const { return mDisks.count() > 1; }
- bool isValid() const { return mValid; }
- QString errorString() const { return mErrorString; }
-private:
- QString mFileName;
- QList<CueTagSet> mDisks;
-
- QString mCodecName;
- QByteArray mPerformer;
- QByteArray mAlbum;
- QByteArray mGenre;
- QByteArray mDate;
- QByteArray mComment;
- QByteArray mSongwriter;
- QByteArray mDiskId;
- QByteArray mCatalog;
- QByteArray mCdTextFile;
-
- bool parse(QFile &file);
- bool parseOneDiskTags(QFile &file, CueTagSet *tags);
- bool mValid;
- QString mErrorString;
+ explicit CueReaderError(const QString &msg): FlaconError(msg) {}
 };
 
 #endif // CUE_H

flacon-4.1.0.tar.gz/disk.cpp -> flacon-5.0.0.tar.gz/disk.cpp Changed

@@ -27,11 +27,12 @@
 #include "disk.h"
 #include "track.h"
 #include "project.h"
+#include "settings.h"
 #include "inputaudiofile.h"
 #include "formats/format.h"
 #include "outformat.h"
-#include "internet/dataprovider.h"
 
+#include "assert.h"
 #include <QTextCodec>
 #include <QFileInfo>
 #include <QStringList>
@@ -42,17 +43,15 @@
 
 #define COVER_PREVIEW_SIZE 500
 
+
 /************************************************
 
 ************************************************/
 Disk::Disk(QObject *parent) :
 QObject(parent),
- mTags(0),
- mStartTrackNum(1),
- mCount(0),
 mAudioFile(0)
 {
- mPreGapTrack = new PreGapTrack(this);
+
 }
 
 
@@ -62,7 +61,7 @@
 Disk::~Disk()
 {
 delete mAudioFile;
- qDeleteAll(mTagSets);
+ qDeleteAll(mTracks);
 }
 
 
@@ -76,6 +75,23 @@
 
 
 /************************************************
+ *
+ ************************************************/
+const Track *Disk::preGapTrack() const
+{
+ if (!mTracks.isEmpty())
+ {
+ mPreGapTrack.setTags(*mTracks.first());
+ mPreGapTrack.setCueFileName(mTracks.first()->cueFileName());
+ mPreGapTrack.setTag(TagId::TrackNum, QByteArray("0"));
+ }
+
+ mPreGapTrack.setTitle("(HTOA)");
+ return &mPreGapTrack;
+}
+
+
+/************************************************
 
 ************************************************/
 bool Disk::canConvert(QString *description) const
@@ -103,7 +119,7 @@
 
 if (mAudioFile->duration() <= duration)
 {
- msg << tr("Audio file shorter than expected from cue sheet.");
+ msg << tr("Audio file shorter than expected from CUE sheet.");
 res = false;
 }
 
@@ -116,26 +132,11 @@
 }
 
 
-/************************************************
-
- ************************************************/
-void Disk::downloadInfo()
-{
- if (discId().isEmpty())
- return;
-
- DataProvider *provider = new FreeDbProvider(this);
- connect(provider, SIGNAL(finished()), this, SLOT(downloadFinished()));
- mDownloads << provider;
- provider->start();
- project->emitDiskChanged(this);
-}
-
 
 /************************************************
 
 ************************************************/
-bool Disk::canDownloadInfo()
+bool Disk::canDownloadInfo() const
 {
 return !discId().isEmpty();
 }
@@ -144,84 +145,88 @@
 /************************************************
 
 ************************************************/
-bool Disk::isDownloads() const
+void Disk::loadFromCue(const CueDisk &cueDisk)
 {
- return mDownloads.count() > 0;
-}
+ QString oldDir = QFileInfo(mCueFile).dir().absolutePath();
 
+ // If the tracks contain tags from the Internet and the
+ // tags have been changed, we must save the changes.
+ syncTagsFromTracks();
+ mTagSets.remove(mCueFile);
 
-/************************************************
+ int count = cueDisk.count();
+ mCueFile = cueDisk.fileName();
 
- ************************************************/
-void Disk::downloadFinished()
-{
- DataProvider *provider = qobject_cast<DataProvider*>(sender());
- mDownloads.removeAll(provider);
- provider->deleteLater();
-}
+ // Remove all tags if number of tracks differ from loaded CUE.
+ for(auto it = mTagSets.begin(); it != mTagSets.end();)
+ {
+ if (it.value().count() != count)
+ it = mTagSets.erase(it);
+ else
+ ++it;
+ }
 
 
-/************************************************
+ // Sync count of tracks
+ for (int i=mTracks.count(); i<count; ++i)
+ {
+ Track *track = new Track();
+ connect(track, &Track::tagChanged, this, &Disk::trackChanged);
+ mTracks.append(track);
 
- ************************************************/
-void Disk::loadFromCue(const CueTagSet &cueTags, bool activate)
-{
- mCount = cueTags.tracksCount();
- mCueFile = cueTags.cueFileName();
+ }
+
+ while (mTracks.count() > count)
+ delete mTracks.takeLast();
 
- for (int i=mTracks.count(); i<mCount; ++i)
- mTracks.append(new Track(this, i));
 
- while (mTracks.count() > mCount)
- mTracks.takeLast()->deleteLater();
+ for (int t=0; t<count; ++t)
+ *mTracks[t] = cueDisk.at(t);
 
- for (int t=0; t<cueTags.tracksCount(); ++t)
+ for (int i=0; i<count; ++i)
 {
- for (int idx=0; idx<100; ++idx)
- mTracks[t]->setCueIndex(idx, cueTags.index(t, idx));
+ Track *track = mTracks[i];
+ track->mDuration = this->trackDuration(i);
 }
 
- if (mTagSets.isEmpty())
- mTagSets << 0;
- else
- delete mTagSets.first();
-
- mTagSets[0] = new TagSet(cueTags);
- setStartTrackNum(cueTags.diskTag(START_TRACK_NUM).toInt());
+ mCurrentTagsUri = mCueFile;
+ syncTagsFromTracks();
+ mTagSets[mCurrentTagsUri].setTitle(cueDisk.title());
 
 if (!mAudioFile)
- findAudioFile(cueTags);
+ findAudioFile(cueDisk);
+
 
- if (activate || !mTags)
+ QString dir = QFileInfo(mCueFile).dir().absolutePath();
+ if (dir != oldDir)
 {
- mTags = mTagSets.first();
- project->emitLayoutChanged();
+ mCoverImagePreview = QImage();
+ mCoverImageFile = searchCoverImage(dir);

flacon-4.1.0.tar.gz/disk.h -> flacon-5.0.0.tar.gz/disk.h Changed

@@ -31,18 +31,11 @@
 #include "cue.h"
 
 #include <QObject>
-#include <QList>
-#include <QVector>
-#include <QAction>
-#include <QHash>
-#include <QChar>
 #include <QImage>
 
-class CueReader;
 class QFile;
 class Disk;
 class InputAudioFile;
-class DataProvider;
 
 
 class Disk: public QObject
@@ -50,14 +43,15 @@
 Q_OBJECT
 friend class Track;
 public:
+
 explicit Disk(QObject *parent = 0);
 virtual ~Disk();
 
 Track *track(int index) const;
- int count() const { return mCount; }
- Track *preGapTrack() const { return mPreGapTrack; }
+ int count() const { return mTracks.count(); }
+ const Track *preGapTrack() const;
 
- void loadFromCue(const CueTagSet &cueTags, bool activate = true);
+ void loadFromCue(const CueDisk &cueDisk);
 QString cueFile() const { return mCueFile; }
 
 InputAudioFile *audioFile() const { return mAudioFile; }
@@ -65,97 +59,79 @@
 void setAudioFile(const InputAudioFile &audio);
 
 
- int startTrackNum() const { return mStartTrackNum; }
+ int startTrackNum() const;
 void setStartTrackNum(int value);
 
- QString textCodecName() const;
- void setTextCodecName(const QString codecName);
+ QString codecName() const;
+ void setCodecName(const QString codecName);
 
 static QString safeString(const QString &str);
 
- QString tagsTitle() const;
+ QString tagSetTitle() const;
 QString tagsUri() const;
- QString discId() const { return tag(TAG_DISCID); }
- QString fileTag() const { return tag(TAG_FILE); }
-
- QString tag(const QString tagName) const;
-
- QList<TagSet*> tagSets() const { return mTagSets; }
+ QString discId() const;
+ QString fileTag() const;
+ DiskNum diskNum() const;
+ DiskNum diskCount() const;
 
+ QStringList warnings() const;
 bool canConvert(QString *description = 0) const;
+ bool canDownloadInfo() const;
 
- bool canDownloadInfo();
- bool isDownloads() const;
 
- void addTagSet(const TagSet &tagSet, bool activate);
- void activateTagSet(const TagSet *tagSet);
+ struct TagSet{
+ QString uri;
+ QString name;
+ };
 
- int distance(const TagSet &other);
- int distance(const TagSet *other);
+ QVector<TagSet> tagSets() const;
+ void addTagSet(const Tracks &tags, bool activate);
+ void addTagSets(const QVector<Tracks> &disks);
+ void activateTagSet(const QString &uri);
 
 QString coverImageFile() const { return mCoverImageFile; }
 void setCoverImageFile(const QString &fileName);
 QImage coverImagePreview() const;
 QImage coverImage() const;
 
+ QString diskTag(TagId tagId) const;
+ QByteArray diskTagData(TagId tagId) const;
+ void setDiskTag(TagId tagId, const QString &value);
+ void setDiskTag(TagId tagId, const QByteArray &value);
+
 static QStringList searchCoverImages(const QString &startDir);
 static QString searchCoverImage(const QString &startDir);
 
-
-public slots:
- void downloadInfo();
-
-signals:
- void trackChanged(int track);
-
-protected:
- QString getTag(int track, const QString &tagName);
- void setTag(int track, const QString &tagName, const QString &value);
+ bool isEmpty() const { return mTracks.isEmpty(); }
 
 private slots:
- void downloadFinished();
+ void trackChanged(TagId tagId);
 
 private:
- QList<TagSet*> mTagSets;
- TagSet *mTags;
+ QHash<QString, Tracks> mTagSets;
 
 QList<Track*> mTracks;
- int mStartTrackNum;
- int mCount;
- QString mCueFile;
+ QString mCueFile;
+ QString mCurrentTagsUri;
+
 InputAudioFile *mAudioFile;
- Track *mPreGapTrack;
- QList<DataProvider*> mDownloads;
+ mutable Track mPreGapTrack;
 
 QString mCoverImageFile;
 mutable QImage mCoverImagePreview;
 
- void findAudioFile(const CueTagSet &cueTags);
+
+ void findAudioFile(const CueDisk &cueDisk);
 void findCueFile();
+ Duration trackDuration(TrackNum trackNum) const;
+ void syncTagsFromTracks();
+ void syncTagsToTracks();
+
+ int distance(const Tracks &other);
+ bool isSameTagValue(TagId tagId);
 };
 
 typedef QList<Disk*> DiskList;
 
 
-class DiskAction: public QAction
-{
- Q_OBJECT
-public:
- DiskAction(QObject* parent, Disk *disk, Track *track = 0, const QString tagName ="");
- DiskAction(const QString &text, QObject* parent, Disk *disk, Track *track = 0, const QString tagName ="");
- DiskAction(const QIcon &icon, const QString &text, QObject* parent, Disk *disk, Track *track = 0, const QString tagName ="");
-
- Disk *disk() const { return mDisk; }
- Track *track() const { return mTrack; }
- QString tagName() const { return mTagName; }
-
-private:
- Disk *mDisk;
- Track *mTrack;
- QString mTagName;
-};
-
-QByteArray leftPart(const QByteArray &line, const QChar separator);
-QByteArray rightPart(const QByteArray &line, const QChar separator);
-
 #endif // DISK_H

flacon-4.1.0.tar.gz/formats/aac.cpp -> flacon-5.0.0.tar.gz/formats/aac.cpp Changed

flacon-4.1.0.tar.gz/formats/flac.cpp -> flacon-5.0.0.tar.gz/formats/flac.cpp Changed

@@ -93,6 +93,7 @@
 ************************************************/
 QStringList OutFormat_Flac::encoderArgs(const Track *track, const QString &outFile) const
 {
+
 QStringList args;
 
 args << settings->programName(encoderProgramName());
@@ -104,17 +105,37 @@
 
 
 // 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());
+ 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->tag(TagId::AlbumArtist).isEmpty())
+ args << "--tag" << QString("albumartist=%1").arg(track->tag(TagId::AlbumArtist));
+
+ if (!track->comment().isEmpty())
+ args << "--tag" << QString("comment=%1").arg(track->comment());
+
+ if (!track->diskId().isEmpty())
+ args << "--tag" << QString("discId=%1").arg(track->diskId());
+
+ args << "--tag" << QString("tracknumber=%1").arg(track->trackNum());
+ args << "--tag" << QString("totaltracks=%1").arg(track->trackCount());
+ args << "--tag" << QString("tracktotal=%1").arg(track->trackCount());
 
+ args << "--tag" << QString("disc=%1").arg(track->diskNum());
+ args << "--tag" << QString("discnumber=%1").arg(track->diskNum());
+ args << "--tag" << QString("disctotal=%1").arg(track->diskCount());
 
 args << "-";
 args << "-o" << outFile;

flacon-4.1.0.tar.gz/formats/flac.h -> flacon-5.0.0.tar.gz/formats/flac.h Changed

flacon-4.1.0.tar.gz/formats/mp3.cpp -> flacon-5.0.0.tar.gz/formats/mp3.cpp Changed

@@ -26,7 +26,6 @@
 
 #include "mp3.h"
 #include "settings.h"
-#include "disk.h"
 #include <QDebug>
 
 
@@ -110,14 +109,29 @@
 // Tags .....................................................
 args << "--add-id3v2";
 //#args << "--id3v2-only"
- if (!track->artist().isEmpty()) args << "--ta" << track->artist();
- if (!track->album().isEmpty()) args << "--tl" << track->album();
- if (!track->genre().isEmpty()) args << "--tg" << track->genre();
- if (!track->date().isEmpty()) args << "--ty" << track->date();
- if (!track->title().isEmpty()) args << "--tt" << track->title();
- if (!track->comment().isEmpty()) args << "--tc" << track->comment();
- args << "--tn" << QString("%1/%2").arg(track->trackNum()).arg(track->disk()->count());
+ if (!track->artist().isEmpty())
+ args << "--ta" << track->artist();
 
+ if (!track->album().isEmpty())
+ args << "--tl" << track->album();
+
+ if (!track->genre().isEmpty())
+ args << "--tg" << track->genre();
+
+ if (!track->date().isEmpty())
+ args << "--ty" << track->date();
+
+ if (!track->title().isEmpty())
+ args << "--tt" << track->title();
+
+ if (!track->tag(TagId::AlbumArtist).isEmpty())
+ args << "--tv" << QString("TPE2=%1").arg(track->tag(TagId::AlbumArtist));
+
+ if (!track->comment().isEmpty())
+ args << "--tc" << track->comment();
+
+ args << "--tn" << QString("%1/%2").arg(track->trackNum()).arg(track->trackCount());
+ args << "--tv" << QString("TPOS=%1").arg(track->diskNum());
 
 // Files ....................................................
 args << "-";

flacon-4.1.0.tar.gz/formats/ogg.cpp -> flacon-5.0.0.tar.gz/formats/ogg.cpp Changed

@@ -74,16 +74,38 @@
 }
 
 // Tags .....................................................
- if (!track->artist().isEmpty()) args << "--artist" << track->artist();
- if (!track->album().isEmpty()) args << "--album" << track->album();
- if (!track->genre().isEmpty()) args << "--genre" << track->genre();
- if (!track->date().isEmpty()) args << "--date" << track->date();
- if (!track->title().isEmpty()) args << "--title" << track->title();
- if (!track->comment().isEmpty()) args << "--comment" << QString("COMMENT=%1").arg(track->comment());
- if (!track->disk()->discId().isEmpty()) args << "--comment" << QString("DISCID=%1").arg(track->disk()->discId());
+ if (!track->artist().isEmpty())
+ args << "--artist" << track->artist();
+
+ if (!track->album().isEmpty())
+ args << "--album" << track->album();
+
+ if (!track->genre().isEmpty())
+ args << "--genre" << track->genre();
+
+ if (!track->date().isEmpty())
+ args << "--date" << track->date();
+
+ if (!track->title().isEmpty())
+ args << "--title" << track->title();
+
+ if (!track->tag(TagId::AlbumArtist).isEmpty())
+ args << "--comment" << QString("album_artist=%1").arg(track->tag(TagId::AlbumArtist));
+
+ if (!track->comment().isEmpty())
+ args << "--comment" << QString("COMMENT=%1").arg(track->comment());
+
+ if (!track->diskId().isEmpty())
+ args << "--comment" << QString("DISCID=%1").arg(track->diskId());
+
+
 args << "--tracknum" << QString("%1").arg(track->trackNum());
- args << "--comment" << QString("TOTALTRACKS=%1").arg(track->disk()->count());
- args << "--comment" << QString("TRACKTOTAL=%1").arg(track->disk()->count());
+ args << "--comment" << QString("totaltracks=%1").arg(track->trackCount());
+ args << "--comment" << QString("tracktotal=%1").arg(track->trackCount());
+
+ args << "--comment" << QString("disc=%1").arg(track->diskNum());
+ args << "--comment" << QString("discnumber=%1").arg(track->diskNum());
+ args << "--comment" << QString("disctotal=%1").arg(track->diskCount());
 
 // Files ....................................................
 args << "-o" << outFile;

flacon-4.1.0.tar.gz/formats/opus.cpp -> flacon-5.0.0.tar.gz/formats/opus.cpp Changed

@@ -71,9 +71,18 @@
 if (!track->date().isEmpty()) args << "--date" << track->date();
 if (!track->title().isEmpty()) args << "--title" << track->title();
 if (!track->comment().isEmpty()) args << "--comment" << QString("COMMENT=%1").arg(track->comment());
- if (!track->disk()->discId().isEmpty()) args << "--comment" << QString("DISCID=%1").arg(track->disk()->discId());
- args << "--comment" << QString("TRACKNUMBER=%1").arg(track->trackNum());
- args << "--comment" << QString("TRACKTOTAL=%1").arg(track->disk()->count());
+ if (!track->diskId().isEmpty()) args << "--comment" << QString("DISCID=%1").arg(track->diskId());
+ if (!track->tag(TagId::AlbumArtist).isEmpty())
+ {
+ args << "--comment" << QString("album_artist=%1").arg(track->tag(TagId::AlbumArtist));
+ }
+
+ args << "--comment" << QString("tracknumber=%1").arg(track->trackNum());
+ args << "--comment" << QString("tracktotal=%1").arg(track->trackCount());
+
+ args << "--comment" << QString("disc=%1").arg(track->diskNum());
+ args << "--comment" << QString("discnumber=%1").arg(track->diskNum());
+ args << "--comment" << QString("disctotal=%1").arg(track->diskCount());
 
 // Files ....................................................
 args << "-";

flacon-4.1.0.tar.gz/formats/outformat.h -> flacon-5.0.0.tar.gz/formats/outformat.h Changed

flacon-4.1.0.tar.gz/formats/wv.cpp -> flacon-5.0.0.tar.gz/formats/wv.cpp Changed

@@ -81,19 +81,41 @@
 
 // Settings .................................................
 int compression = settings->value("WV/Compression").toInt();
- if (compression == 0) args << "-f";
- if (compression == 1) args << "-h";
- if (compression == 2) args << "-hh";
+ switch (compression)
+ {
+ case 0: args << "-f"; break;
+ case 1: args << "-h"; break;
+ case 2: args << "-hh"; break;
+ }
 
 // 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());
+ 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->tag(TagId::AlbumArtist).isEmpty())
+ args << "-w" << QString("Album Artist=%1").arg(track->tag(TagId::AlbumArtist));
+
+ if (!track->diskId().isEmpty())
+ args << "-w" << QString("DiscId=%1").arg(track->diskId());
+
+ if (!track->comment().isEmpty())
+ args << "-w" << QString("Comment=%1").arg(track->comment());
+
+
+ args << "-w" << QString("Track=%1/%2").arg(track->trackNum()).arg(track->trackCount());
+ args << "-w" << QString("Part=%1").arg(track->diskNum());
 
 args << "-";
 args << "-o" << outFile;

flacon-4.1.0.tar.gz/gui/aboutdialog/translatorsinfo.cpp -> flacon-5.0.0.tar.gz/gui/aboutdialog/translatorsinfo.cpp Changed

flacon-4.1.0.tar.gz/gui/configdialog/configdialog.cpp -> flacon-5.0.0.tar.gz/gui/configdialog/configdialog.cpp Changed

@@ -44,6 +44,27 @@
 #include "updater/updater.h"
 #endif
 
+
+/************************************************
+ *
+ ************************************************/
+static void loadWidget(Settings::Key  key, QComboBox *widget)
+{
+    int n = qMax(0, widget->findData(settings->value(key)));
+    widget->setCurrentIndex(n);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+static void writeWidget(Settings::Key key, QComboBox *widget)
+{
+    QVariant data = widget->itemData(widget->currentIndex());
+    settings->setValue(key, data);
+}
+
+
 /************************************************
 
  ************************************************/
@@ -83,17 +104,7 @@
 
     connect(pages, SIGNAL(currentChanged(int)), this, SLOT(setPage(int)));
 
-    tmpDirButton->setIcon(loadIcon("folder"));
-    connect(tmpDirButton, SIGNAL(clicked()), this, SLOT(tmpDirShowDialog()));
-
-
-    connect(coverDisableButton,  &QRadioButton::clicked,  [=](){this->setCoverMode(CoverMode::Disable);  });
-    connect(coverKeepSizeButton, &QRadioButton::clicked,  [=](){this->setCoverMode(CoverMode::OrigSize); });
-    connect(coverScaleButton,    &QRadioButton::clicked,  [=](){this->setCoverMode(CoverMode::Scale);    });
-
-    preGapComboBox->addItem(tr("Extract to separate file"), preGapTypeToString(PreGapType::ExtractToFile));
-    preGapComboBox->addItem(tr("Add to first track"),       preGapTypeToString(PreGapType::AddToFirstTrack));
-
+    initGeneralPage();
     initTabPages();
 
 #ifdef MAC_BUNDLE
@@ -125,6 +136,37 @@
 
 
 /************************************************
+ *
+ ************************************************/
+void ConfigDialog::initGeneralPage()
+{
+    tmpDirButton->setIcon(loadIcon("folder"));
+    connect(tmpDirButton, SIGNAL(clicked()), this, SLOT(tmpDirShowDialog()));
+
+
+    connect(coverDisableButton,  &QRadioButton::clicked,  [=](){this->setCoverMode(CoverMode::Disable);  });
+    connect(coverKeepSizeButton, &QRadioButton::clicked,  [=](){this->setCoverMode(CoverMode::OrigSize); });
+    connect(coverScaleButton,    &QRadioButton::clicked,  [=](){this->setCoverMode(CoverMode::Scale);    });
+
+    preGapComboBox->addItem(tr("Extract to separate file"), preGapTypeToString(PreGapType::ExtractToFile));
+    preGapComboBox->addItem(tr("Add to first track"),       preGapTypeToString(PreGapType::AddToFirstTrack));
+
+
+    bitDepthComboBox->addItem(tr("Same as source", "Item in combobox"), int(BitsPerSample::AsSourcee));
+    bitDepthComboBox->addItem(tr("16-bit",         "Item in combobox"), int(BitsPerSample::Bit_16));
+    bitDepthComboBox->addItem(tr("24-bit",         "Item in combobox"), int(BitsPerSample::Bit_24));
+    bitDepthComboBox->addItem(tr("32-bit",         "Item in combobox"), int(BitsPerSample::Bit_32));
+
+    sampleRateComboBox->addItem(tr("Same as source", "Item in combobox"), int(SampleRate::AsSource));
+    sampleRateComboBox->addItem(tr("44100 Hz",       "Item in combobox"), int(SampleRate::Hz_44100));
+    sampleRateComboBox->addItem(tr("48000 Hz",       "Item in combobox"), int(SampleRate::Hz_48000));
+    sampleRateComboBox->addItem(tr("96000 Hz",       "Item in combobox"), int(SampleRate::Hz_96000));
+    sampleRateComboBox->addItem(tr("192000 Hz",      "Item in combobox"), int(SampleRate::Hz_192000));
+
+}
+
+
+/************************************************
 
  ************************************************/
 void ConfigDialog::initTabPages()
@@ -338,8 +380,12 @@
     EncoderConfigPage::loadWidget("PerTrackCue/Create",    perTrackCueCheck);
     EncoderConfigPage::loadWidget("PerTrackCue/Pregap",    preGapComboBox);
 
+
+    loadWidget(Settings::Resample_BitsPerSample,   bitDepthComboBox);
+    loadWidget(Settings::Resample_SampleRate, sampleRateComboBox);
+
     setCoverMode(settings->coverMode());
-    loadWidget(Settings::Cover_ResizeSize,   coverResizeSpinBox);
+    loadWidget(Settings::Cover_Size,   coverResizeSpinBox);
 
     foreach(EncoderConfigPage *page, mEncodersPages)
         page->load();
@@ -364,8 +410,11 @@
     EncoderConfigPage::writeWidget("PerTrackCue/Create",    perTrackCueCheck);
     EncoderConfigPage::writeWidget("PerTrackCue/Pregap",    preGapComboBox);
 
+    writeWidget(Settings::Resample_BitsPerSample,   bitDepthComboBox);
+    writeWidget(Settings::Resample_SampleRate, sampleRateComboBox);
+
     settings->setValue(Settings::Cover_Mode, coverModeToString(coverMode()));
-    writeWidget(Settings::Cover_ResizeSize,   coverResizeSpinBox);
+    writeWidget(Settings::Cover_Size,   coverResizeSpinBox);
 
     foreach(EncoderConfigPage *page, mEncodersPages)
         page->write();

flacon-4.1.0.tar.gz/gui/configdialog/configdialog.h -> flacon-5.0.0.tar.gz/gui/configdialog/configdialog.h Changed

flacon-4.1.0.tar.gz/gui/configdialog/configdialog.ui -> flacon-5.0.0.tar.gz/gui/configdialog/configdialog.ui Changed

@@ -7,11 +7,11 @@
 <x>0</x>
 <y>0</y>
 <width>635</width>
- <height>521</height>
+ <height>597</height>
 </rect>
 </property>
 <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
 <horstretch>0</horstretch>
 <verstretch>0</verstretch>
 </sizepolicy>
@@ -69,8 +69,14 @@
 <string>General</string>
 </attribute>
 <layout class="QVBoxLayout" name="verticalLayout_6">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
 <item>
 <layout class="QGridLayout" name="formLayout_6">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
 <item row="0" column="0">
 <widget class="QLabel" name="threadsCountLabel">
 <property name="text">
@@ -109,7 +115,7 @@
 <item>
 <widget class="QToolButton" name="tmpDirButton">
 <property name="text">
- <string notr="true">...</string>
+ <string notr="true">…</string>
 </property>
 </widget>
 </item>
@@ -130,13 +136,16 @@
 <item>
 <widget class="QGroupBox" name="perTrackCueGroup">
 <property name="title">
- <string>Per track cue sheet</string>
+ <string>Per track CUE sheet</string>
 </property>
 <layout class="QVBoxLayout" name="verticalLayout_3">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
 <item>
 <widget class="QCheckBox" name="perTrackCueCheck">
 <property name="text">
- <string>Create per track cue sheet</string>
+ <string>Create per track CUE sheet</string>
 </property>
 </widget>
 </item>
@@ -179,6 +188,9 @@
 <bool>false</bool>
 </property>
 <layout class="QVBoxLayout" name="verticalLayout_4">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
 <item>
 <layout class="QGridLayout" name="gridLayout_2">
 <item row="0" column="0" colspan="2">
@@ -230,10 +242,45 @@
 </widget>
 </item>
 <item>
+ <widget class="QGroupBox" name="resamplingGroupBox">
+ <property name="title">
+ <string>Resampling</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="bitDepthLabel">
+ <property name="text">
+ <string>Maximum bit depth:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="bitDepthComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="sampleRateLabel">
+ <property name="text">
+ <string>Maximum sample rate:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="sampleRateComboBox"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
 <spacer name="verticalSpacer_5">
 <property name="orientation">
 <enum>Qt::Vertical</enum>
 </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
 <property name="sizeHint" stdset="0">
 <size>
 <width>20</width>
@@ -262,8 +309,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>601</width>
- <height>334</height>
+ <width>579</width>
+ <height>385</height>
 </rect>
 </property>
 <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -406,8 +453,23 @@
 </customwidget>
 </customwidgets>
 <tabstops>
+ <tabstop>pages</tabstop>
+ <tabstop>threadsCountSpin</tabstop>
+ <tabstop>tmpDirEdit</tabstop>
+ <tabstop>tmpDirButton</tabstop>
+ <tabstop>codePageComboBox</tabstop>
+ <tabstop>perTrackCueCheck</tabstop>
+ <tabstop>preGapComboBox</tabstop>
+ <tabstop>coverDisableButton</tabstop>
+ <tabstop>coverKeepSizeButton</tabstop>
+ <tabstop>coverScaleButton</tabstop>
+ <tabstop>coverResizeSpinBox</tabstop>
+ <tabstop>bitDepthComboBox</tabstop>
+ <tabstop>sampleRateComboBox</tabstop>
+ <tabstop>progsArea</tabstop>
 <tabstop>progScanButton</tabstop>
- <tabstop>buttonBox</tabstop>
+ <tabstop>autoUpdateCbk</tabstop>
+ <tabstop>updateNowBtn</tabstop>
 </tabstops>
 <resources/>
 <connections>

flacon-4.1.0.tar.gz/gui/controls.cpp -> flacon-5.0.0.tar.gz/gui/controls.cpp Changed

@@ -38,16 +38,6 @@
 #include <QCompleter>
 #include <QStringListModel>
 
-/************************************************
-
- ************************************************/
-void setPlaceholder(QLineEdit *edit, const QString &text)
-{
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
- if (edit)
- edit->setPlaceholderText(text);
-#endif
-}
 
 /************************************************
 
@@ -185,7 +175,48 @@
 QSpinBox(parent),
 mMultiState(MultiValuesEmpty)
 {
+}
+
+
+/************************************************
+ *
+ ************************************************/
+static MultiValuesState getTagEditState(const QSet<QString> values)
+{
+ switch (values.count())
+ {
+ case 0: return MultiValuesEmpty;
+ case 1: return MultiValuesSingle;
+ default: return MultiValuesMulti;
+ }
+}
 
+
+/************************************************
+ *
+ ************************************************/
+static QString getTagEditText(const QSet<QString> values)
+{
+ switch (values.count())
+ {
+ case 0: return "";
+ case 1: return *(values.constBegin());
+ default: return "";
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+static QString getTagEditPlaceHolder(const QSet<QString> values)
+{
+ switch (values.count())
+ {
+ case 0: return "";
+ case 1: return "";
+ default: return QObject::tr("Multiple values");
+ }
 }
 
 
@@ -194,13 +225,23 @@
 ************************************************/
 void MultiValuesSpinBox::stepBy(int steps)
 {
+ // The QSpinBox::stepBy resets the lineEdit.isModified value.
+ // So we blockSignals, set modified and then emit the signals manually.
+ this->blockSignals(true);
 if (mMultiState != MultiValuesSingle && steps > 0)
 {
 mMultiState = MultiValuesSingle;
 QSpinBox::stepBy(0);
 }
 else
+ {
 QSpinBox::stepBy(steps);
+ }
+ this->blockSignals(false);
+
+ lineEdit()->setModified(true);
+ emit valueChanged(this->value());
+ emit valueChanged(lineEdit()->text());
 }
 
 
@@ -214,26 +255,38 @@
 {
 mMultiState = MultiValuesEmpty;
 QSpinBox::setValue(minimum());
- setPlaceholder(lineEdit(), "");
+ if (lineEdit())
+ lineEdit()->setPlaceholderText("");
 }
 
 else if (value.count() == 1)
 {
 mMultiState = MultiValuesSingle;
 QSpinBox::setValue(*(value.constBegin()));
- setPlaceholder(lineEdit(), "");
+ if (lineEdit())
+ lineEdit()->setPlaceholderText("");
 }
 
 else
 {
 mMultiState = MultiValuesMulti;
 QSpinBox::setValue(minimum());
- setPlaceholder(lineEdit(), tr("Multiple values"));
+ if (lineEdit())
+ lineEdit()->setPlaceholderText(tr("Multiple values"));
 }
 }
 
 
 /************************************************
+ *
+ ************************************************/
+void MultiValuesSpinBox::setModified(bool modified)
+{
+ lineEdit()->setModified(modified);
+}
+
+
+/************************************************
 
 ************************************************/
 QString MultiValuesSpinBox::textFromValue(int val) const
@@ -266,7 +319,7 @@
 setCompleter(new QCompleter(this));
 completer()->setModel(mCompleterModel);
 completer()->setCaseSensitivity(Qt::CaseInsensitive);
- completer()->setCompletionMode(QCompleter::UnfilteredPopupCompletion);
+ completer()->setCompletionMode(QCompleter::PopupCompletion);
 }
 
 
@@ -279,7 +332,7 @@
 {
 mMultiState = MultiValuesEmpty;
 QLineEdit::setText("");
- setPlaceholder(this, "");
+ setPlaceholderText("");
 mCompleterModel->setStringList(QStringList());
 }
 
@@ -287,7 +340,7 @@
 {
 mMultiState = MultiValuesEmpty;
 QLineEdit::setText(*(value.constBegin()));
- setPlaceholder(this, "");
+ setPlaceholderText("");
 mCompleterModel->setStringList(value.toList());
 }
 
@@ -295,11 +348,21 @@
 {
 mMultiState = MultiValuesMulti;
 QLineEdit::setText("");
- setPlaceholder(this, tr("Multiple values"));
+ setPlaceholderText(tr("Multiple values"));
 mCompleterModel->setStringList(value.toList());
 }
 }
 
+/************************************************
+ *
+ ************************************************/
+
+TagLineEdit::TagLineEdit(QWidget *parent):
+ MultiValuesLineEdit(parent),
+ mTagId(TagId())
+{
+}
+
 
 /************************************************
 
@@ -323,7 +386,8 @@
 {
 mMultiState = MultiValuesEmpty;
 setCurrentIndex(-1);
- setPlaceholder(lineEdit(), "");
+ if (lineEdit())
+ lineEdit()->setPlaceholderText("");
 }
 
 else if (v.count() == 1)
@@ -335,14 +399,16 @@
 else
 mMultiState = MultiValuesEmpty;
 
- setPlaceholder(lineEdit(), "");
+ if (lineEdit())
+ lineEdit()->setPlaceholderText("");
 }

flacon-4.1.0.tar.gz/gui/controls.h -> flacon-5.0.0.tar.gz/gui/controls.h Changed

@@ -31,8 +31,10 @@
 #include <QToolButton>
 #include <QComboBox>
 #include <QLineEdit>
+#include <QPlainTextEdit>
 #include <QSet>
 #include <QMenu>
+#include "tags.h"
 
 class QStringListModel;
 
@@ -72,6 +74,24 @@
 
 
 
+/************************************************
+ *
+ ************************************************/
+class ActionsButton: public QToolButton
+{
+ Q_OBJECT
+public:
+ explicit ActionsButton(QWidget * parent=0);
+ QMenu *menu() { return &mMenu; }
+
+private slots:
+ void popupMenu();
+
+private:
+
+ QMenu mMenu;
+};
+
 
 /************************************************
 
@@ -84,8 +104,11 @@
 bool multi() const { return mMultiState == MultiValuesMulti; }
 void stepBy(int steps);
 
+ bool isModified() const { return lineEdit()->isModified();}
+
 public slots:
 void setMultiValue(QSet<int> value);
+ void setModified(bool modified);
 
 protected:
 QString textFromValue(int val) const;
@@ -104,7 +127,7 @@
 Q_OBJECT
 public:
 explicit MultiValuesLineEdit(QWidget *parent = 0);
- bool multi() const { return mMultiState == MultiValuesMulti; }
+
 
 public slots:
 void setMultiValue(QSet<QString> value);
@@ -118,19 +141,74 @@
 /************************************************
 
 ************************************************/
+class MultiValuesTextEdit: public QPlainTextEdit
+{
+ Q_OBJECT
+public:
+ explicit MultiValuesTextEdit(QWidget *parent = 0);
+
+ bool isModified() const;
+ QString text() const { return this->toPlainText(); }
+
+public slots:
+ void setMultiValue(QSet<QString> value);
+
+private:
+ MultiValuesState mMultiState;
+};
+
+
+/************************************************
+ *
+ ************************************************/
+class TagTextEdit: public MultiValuesTextEdit
+{
+ Q_OBJECT
+public:
+ explicit TagTextEdit(QWidget *parent = 0);
+
+ TagId tagId() const { return mTagId; }
+ void setTagId(TagId tagId) { mTagId = tagId; }
+
+
+private:
+ TagId mTagId;
+};
+
+/************************************************
+
+ ************************************************/
 class TagLineEdit: public MultiValuesLineEdit
 {
 Q_OBJECT
 public:
- explicit TagLineEdit(QWidget *parent = 0): MultiValuesLineEdit(parent) {}
+ explicit TagLineEdit(QWidget *parent = 0);
 
- QString tagName() const { return mTagName; }
- void setTagName(const QString &tagName) { mTagName = tagName; }
+ TagId tagId() const { return mTagId; }
+ void setTagId(TagId tagId) { mTagId = tagId; }
 
 private:
- QString mTagName;
+ TagId mTagId;
 };
 
+
+/************************************************
+ *
+ ************************************************/
+class TagSpinBox: public MultiValuesSpinBox
+{
+ Q_OBJECT
+public:
+ explicit TagSpinBox(QWidget *parent = 0);
+
+ TagId tagId() const { return mTagId; }
+ void setTagId(TagId tagId) { mTagId = tagId; }
+
+private:
+ TagId mTagId;
+};
+
+
 /************************************************
 
 ************************************************/
@@ -200,6 +278,10 @@
 };
 
 
+
+/************************************************
+ *
+ ************************************************/
 class HistoryComboBox: public QComboBox
 {
 Q_OBJECT
@@ -208,8 +290,27 @@
 QStringList history() const;
 void setHistory(const QStringList &value);
 
+ QAction * deleteItemAction() { return &mDeleteItemAct; }
+
 protected:
 void focusOutEvent(QFocusEvent *e);
+
+private slots:
+ void deleteItem();
+
+private:
+ QAction mDeleteItemAct;
+};
+
+
+/************************************************
+ *
+ ************************************************/
+class OutDirComboBox : public HistoryComboBox
+{
+ Q_OBJECT
+public:
+ explicit OutDirComboBox(QWidget *parent = 0);
 };
 
 #endif // CONTROLS_H

flacon-4.1.0.tar.gz/gui/coverdialog/coverdialog.cpp -> flacon-5.0.0.tar.gz/gui/coverdialog/coverdialog.cpp Changed

flacon-4.1.0.tar.gz/gui/coverdialog/coverdialog.h -> flacon-5.0.0.tar.gz/gui/coverdialog/coverdialog.h Changed

flacon-4.1.0.tar.gz/gui/cuediskselectdialog/cuediskselectdialog.cpp -> flacon-5.0.0.tar.gz/gui/cuediskselectdialog/cuediskselectdialog.cpp Changed

@@ -27,27 +27,29 @@
 #include "cuediskselectdialog.h"
 #include "ui_cuediskselectdialog.h"
 
+#include <assert.h>
 #include "../cue.h"
 
 
 /************************************************
 *
 ************************************************/
-CueDiskSelectDialog::CueDiskSelectDialog(const CueReader &cue, int selectedDisk, QWidget *parent) :
+CueDiskSelectDialog::CueDiskSelectDialog(const QVector<CueDisk> &cue, int selectedDisk, QWidget *parent) :
 QDialog(parent),
 ui(new Ui::CueDiskSelectDialog),
 mCue(cue)
 {
- if (selectedDisk < 0 || selectedDisk >= cue.diskCount())
+ if (selectedDisk < 0 || selectedDisk >= cue.count())
 selectedDisk = 0;
 
 ui->setupUi(this);
 
- for (int d=0; d<cue.diskCount(); d++)
+ for (int d=0; d<cue.count(); d++)
 {
- CueTagSet tags = cue.disk(d);
+ CueDisk tags = cue.at(d);
 QTreeWidgetItem *diskItem = new QTreeWidgetItem(ui->diskTree);
- diskItem->setText(0, tr("%1 [ disk %2 ]", "Cue disk select dialog, string like 'The Wall [disk 1]'").arg(tags.diskTag("ALBUM")).arg(d+1));
+ assert(!tags.isEmpty());
+ diskItem->setText(0, tr("%1 [ disk %2 ]", "Cue disk select dialog, string like 'The Wall [disk 1]'").arg(tags.first().album()).arg(d+1));
 diskItem->setData(0,Qt::UserRole, d);
 if (d == selectedDisk)
 {
@@ -59,10 +61,10 @@
 font.setBold(true);
 diskItem->setFont(0, font);
 
- for (int t=0; t<tags.tracksCount(); ++t)
+ for (int t=0; t<tags.count(); ++t)
 {
 QTreeWidgetItem *trackItem = new QTreeWidgetItem(diskItem);
- trackItem->setText(0, tags.trackTag(t, "TITLE"));
+ trackItem->setText(0, tags.at(t).title());
 trackItem->setFlags(Qt::NoItemFlags );
 }
 }
@@ -105,7 +107,7 @@
 /************************************************
 *
 ************************************************/
-int CueDiskSelectDialog::getDiskNumber(const CueReader &cue, int selectedDisk)
+int CueDiskSelectDialog::getDiskNumber(const QVector<CueDisk> &cue, int selectedDisk)
 {
 CueDiskSelectDialog dialog(cue, selectedDisk);

flacon-4.1.0.tar.gz/gui/cuediskselectdialog/cuediskselectdialog.h -> flacon-5.0.0.tar.gz/gui/cuediskselectdialog/cuediskselectdialog.h Changed

flacon-4.1.0.tar.gz/gui/mainwindow.cpp -> flacon-5.0.0.tar.gz/gui/mainwindow.cpp Changed

@@ -37,6 +37,9 @@
 #include "cuediskselectdialog/cuediskselectdialog.h"
 #include "scanner.h"
 #include "gui/coverdialog/coverdialog.h"
+#include "internet/dataprovider.h"
+#include "gui/trackviewmodel.h"
+#include "gui/tageditor/tageditor.h"
 
 #include <QFileDialog>
 #include <QDir>
@@ -49,6 +52,7 @@
 #include <QStyleFactory>
 #include <QToolBar>
 #include <QToolButton>
+#include <QStandardPaths>
 
 #ifdef MAC_UPDATER
 #include "updater/updater.h"
@@ -61,6 +65,8 @@
 QMainWindow(parent),
 mScanner(nullptr)
 {
+ Messages::setHandler(this);
+
 setupUi(this);
 
 qApp->setWindowIcon(loadMainIcon());
@@ -90,29 +96,39 @@
 trackView->setAlternatingRowColors(false);
 
 // Tag edits ...............................................
- tagGenreEdit->setTagName(TAG_GENRE);
- connect(tagGenreEdit, SIGNAL(editingFinished()), this, SLOT(setTrackTag()));
+ tagGenreEdit->setTagId(TagId::Genre);
+ connect(tagGenreEdit, SIGNAL(textEdited(QString)), this, SLOT(setTrackTag()));
+
+ tagYearEdit->setTagId(TagId::Date);
+ connect(tagYearEdit, SIGNAL(textEdited(QString)), this, SLOT(setTrackTag()));
 
- tagYearEdit->setTagName(TAG_DATE);
- connect(tagYearEdit, SIGNAL(editingFinished()), this, SLOT(setTrackTag()));
+ tagArtistEdit->setTagId(TagId::Artist);
+ connect(tagArtistEdit, SIGNAL(textEdited(QString)), this, SLOT(setTrackTag()));
+ connect(tagArtistEdit, SIGNAL(textEdited(QString)), this, SLOT(refreshEdits()));
 
- tagArtistEdit->setTagName(TAG_PERFORMER);
- connect(tagArtistEdit, SIGNAL(editingFinished()), this, SLOT(setTrackTag()));
+ tagDiskPerformerEdit->setTagId(TagId::AlbumArtist);
+ connect(tagDiskPerformerEdit, SIGNAL(textEdited(QString)), this, SLOT(setDiskTag()));
+ connect(tagDiskPerformerEdit, SIGNAL(textEdited(QString)), this, SLOT(refreshEdits()));
 
- tagAlbumEdit->setTagName(TAG_ALBUM);
- connect(tagAlbumEdit, SIGNAL(editingFinished()), this, SLOT(setTrackTag()));
+ tagAlbumEdit->setTagId(TagId::Album);
+ connect(tagAlbumEdit, SIGNAL(textEdited(QString)), this, SLOT(setTrackTag()));
 
- tagDiscIdEdit->setTagName(TAG_DISCID);
 
+ tagDiscIdEdit->setTagId(TagId::DiscId);
 connect(tagStartNumEdit, SIGNAL(editingFinished()), this, SLOT(setStartTrackNum()));
 connect(tagStartNumEdit, SIGNAL(valueChanged(int)), this, SLOT(setStartTrackNum()));
 
+ connect(trackView->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), this, SLOT(refreshEdits()));
+ connect(trackView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(trackViewMenu(QPoint)));
+
+ connect(editTagsButton, &QPushButton::clicked, this, &MainWindow::openEditTagsDialog);
+
 initActions();
 
 // Buttons .................................................
- outDirButton->setDefaultAction(actionSelectResultDir);
 outDirButton->setAutoRaise(true);
 outDirButton->setStyleSheet("border: none;");
+ initOutDirButton();
 
 configureEncoderBtn->setDefaultAction(actionConfigureEncoder);
 configureEncoderBtn->setAutoRaise(true);
@@ -149,9 +165,9 @@
 outPatternButton->addFullPattern(pattern, tr("Use \"%1\"", "Predefined out file pattern, string like 'Use \"%a/%A/%n - %t\"'").arg(pattern));
 
 outPatternButton->menu()->addSeparator();
- QAction *act = new QAction(tr("Delete current pattern from history"), outPatternButton);
- connect(act, SIGNAL(triggered()), this, SLOT(deletePattern()));
- outPatternButton->menu()->addAction(act);
+
+ outPatternEdit->deleteItemAction()->setText(tr("Delete current pattern from history"));
+ outPatternButton->menu()->addAction(outPatternEdit->deleteItemAction());
 
 outPatternButton->setFixedWidth(outDirButton->sizeHint().width());
 connect(outPatternButton, SIGNAL(paternSelected(QString)),
@@ -159,7 +175,6 @@
 
 connect(outPatternButton, SIGNAL(fullPaternSelected(QString)),
 this, SLOT(replaceOutPattern(QString)));
- outPatternEdit->setAutoCompletionCaseSensitivity(Qt::CaseSensitive);
 
 outPatternButton->setIcon(loadIcon("pattern-button"));
 
@@ -168,19 +183,27 @@
 
 loadSettings();
 
+ outDirEdit->setHistory(settings->value(Settings::OutFiles_DirectoryHistory).toStringList());
+ outDirEdit->setCurrentText(settings->value(Settings::OutFiles_Directory).toString());
+
+ outPatternEdit->setHistory(settings->value(Settings::OutFiles_PatternHistory).toStringList());
+
 // Signals .................................................
 connect(settings, SIGNAL(changed()), trackView->model(), SIGNAL(layoutChanged()));
+
 connect(outPatternEdit->lineEdit(), SIGNAL(editingFinished()), this, SLOT(setPattern()));
 connect(outPatternEdit, SIGNAL(currentIndexChanged(int)), this, SLOT(setPattern()));
- connect(outDirEdit, SIGNAL(editingFinished()), this, SLOT(setOutDir()));
+
+ connect(outDirEdit->lineEdit(), SIGNAL(editingFinished()), this, SLOT(setOutDir()));
+ connect(outDirEdit, SIGNAL(currentIndexChanged(int)), this, SLOT(setOutDir()));
 
 connect(outFormatCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setOutFormat()));
 connect(codepageCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setCodePage()));
 
- connect(trackView, SIGNAL(selectCueFile(Disk*)), this, SLOT(setCueForDisc(Disk*)));
- connect(trackView, SIGNAL(selectAudioFile(Disk*)), this, SLOT(setAudioForDisk(Disk*)));
- connect(trackView, SIGNAL(selectCoverImage(Disk*)),
- this, SLOT(setCoverImage(Disk*)));
+ connect(trackView, SIGNAL(selectCueFile(Disk*)), this, SLOT(setCueForDisc(Disk*)));
+ connect(trackView, SIGNAL(selectAudioFile(Disk*)), this, SLOT(setAudioForDisk(Disk*)));
+ connect(trackView, SIGNAL(selectCoverImage(Disk*)), this, SLOT(setCoverImage(Disk*)));
+ connect(trackView, SIGNAL(downloadInfo(Disk*)), this, SLOT(downloadDiskInfo(Disk*)));
 
 connect(trackView->model(), SIGNAL(layoutChanged()), this, SLOT(refreshEdits()));
 connect(trackView->model(), SIGNAL(layoutChanged()), this, SLOT(setControlsEnable()));
@@ -195,7 +218,6 @@
 connect(project, SIGNAL(diskChanged(Disk*)), this, SLOT(refreshEdits()));
 connect(project, SIGNAL(diskChanged(Disk*)), this, SLOT(setControlsEnable()));
 
- outPatternEdit->setHistory(settings->value(Settings::OutFiles_PatternHistory).toStringList());
 
 refreshEdits();
 setControlsEnable();
@@ -238,20 +260,11 @@
 {
 foreach(QUrl url, event->mimeData()->urls())
 {
-#if (QT_VERSION < QT_VERSION_CHECK(4, 8, 0))
- QString scheme = url.scheme();
- if (scheme.isEmpty() || scheme == "file")
- {
- event->acceptProposedAction();
- return;
- }
-#else
 if (url.isLocalFile())
 {
 event->acceptProposedAction();
 return;
 }
-#endif
 }
 }
 
@@ -301,29 +314,10 @@
 /************************************************
 
 ************************************************/
-void MainWindow::deletePattern()
-{
- QStringList history = settings->value(Settings::OutFiles_PatternHistory).toStringList();
- QString currentPattern = outPatternEdit->currentText();
- history.removeOne(currentPattern);
-
- if (history.isEmpty())
- currentPattern = "";
- else
- currentPattern = history.first();
- outPatternEdit->lineEdit()->setText(currentPattern);
- settings->setValue(Settings::OutFiles_Pattern, currentPattern);
- outPatternEdit->setHistory(history);
- settings->setValue(Settings::OutFiles_PatternHistory, history);
-}
-
-
-/************************************************
-
- ************************************************/
 void MainWindow::setOutDir()
 {
- settings->setValue(Settings::OutFiles_Directory, outDirEdit->text());
+ settings->setValue(Settings::OutFiles_Directory, outDirEdit->currentText());
+ settings->setValue(Settings::OutFiles_DirectoryHistory, outDirEdit->history());
 }
 
 
@@ -332,11 +326,11 @@
 ************************************************/
 void MainWindow::openOutDirDialog()
 {
- QString outDir = QFileDialog::getExistingDirectory(this, tr("Select result directory"), outDirEdit->text());
+ QString outDir = QFileDialog::getExistingDirectory(this, tr("Select result directory"), outDirEdit->currentText());
 if (!outDir.isEmpty())
 {

flacon-4.1.0.tar.gz/gui/mainwindow.h -> flacon-5.0.0.tar.gz/gui/mainwindow.h Changed

@@ -29,6 +29,7 @@
 
 #include <QMainWindow>
 #include "ui_mainwindow.h"
+#include "types.h"
 #include <QPointer>
 
 namespace Ui {
@@ -39,7 +40,7 @@
 class Converter;
 class Scanner;
 
-class MainWindow : public QMainWindow, private Ui::MainWindow
+class MainWindow : public QMainWindow, private Ui::MainWindow, private Messages::Handler
 {
 Q_OBJECT
 
@@ -52,13 +53,15 @@
 void startConvert();
 void stopConvert();
 
+signals:
+ void downloadStarted(Disk *disk);
+ void downloadFinished(Disk *disk);
 
 private slots:
 void insertOutPattern(const QString &pattern);
 void replaceOutPattern(const QString &pattern);
 
 void setPattern();
- void deletePattern();
 void setOutDir();
 void setOutFormat();
 void setCodePage();
@@ -72,12 +75,14 @@
 void setCueForDisc(Disk *disk);
 void setAudioForDisk(Disk *disk);
 void setCoverImage(Disk *disk);
+ void downloadDiskInfo(Disk *disk);
 
 void removeDisks();
 
 void setStartTrackNum();
 void setTrackTag();
-
+ void setDiskTag();
+ void setDiskTagInt();
 
 void configure();
 void configureEncoder();
@@ -88,6 +93,9 @@
 void openAboutDialog();
 void checkUpdates();
 
+ void trackViewMenu(const QPoint &pos);
+ void openEditTagsDialog();
+
 protected:
 void closeEvent(QCloseEvent *) override;
 void dragEnterEvent(QDragEnterEvent *event) override;
@@ -101,6 +109,7 @@
 Scanner *mScanner;
 QString getOpenFileFilter(bool includeAudio, bool includeCue);
 
+ void initOutDirButton();
 void initActions();
 void initOutFormatCombo();
 
@@ -108,6 +117,8 @@
 void saveSettings();
 
 QIcon loadMainIcon();
+
+ void showErrorMessage(const QString &message) override;
 };
 
 #endif // MAINWINDOW_H

flacon-4.1.0.tar.gz/gui/mainwindow.ui -> flacon-5.0.0.tar.gz/gui/mainwindow.ui Changed

@@ -42,20 +42,21 @@
 <property name="text">
 <string>Directory:</string>
 </property>
- <property name="buddy">
- <cstring>outDirEdit</cstring>
- </property>
 </widget>
 </item>
 <item row="0" column="1">
 <layout class="QHBoxLayout" name="horizontalLayout_3">
 <item>
- <widget class="QLineEdit" name="outDirEdit"/>
+ <widget class="OutDirComboBox" name="outDirEdit">
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ </widget>
 </item>
 <item>
- <widget class="QToolButton" name="outDirButton">
+ <widget class="ActionsButton" name="outDirButton">
 <property name="text">
- <string notr="true">...</string>
+ <string notr="true">*</string>
 </property>
 </widget>
 </item>
@@ -102,7 +103,7 @@
 <item>
 <widget class="OutPatternButton" name="outPatternButton">
 <property name="text">
- <string/>
+ <string notr="true">*</string>
 </property>
 </widget>
 </item>
@@ -157,30 +158,59 @@
 <string>Tags</string>
 </property>
 <layout class="QGridLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="tagGenreEditLabel_2">
+ <item row="3" column="0">
+ <widget class="QLabel" name="tagDiskPerformerLabel">
 <property name="text">
- <string>Genre:</string>
+ <string>Album performer:</string>
 </property>
 <property name="buddy">
- <cstring>tagGenreEdit</cstring>
+ <cstring>tagDiskPerformerEdit</cstring>
 </property>
 </widget>
 </item>
- <item row="0" column="1">
- <widget class="TagLineEdit" name="tagGenreEdit"/>
+ <item row="8" column="1" colspan="2">
+ <widget class="CodePageComboBox" name="codepageCombo"/>
 </item>
- <item row="1" column="0">
- <widget class="QLabel" name="tagYearEditLabel">
+ <item row="3" column="1" colspan="2">
+ <widget class="TagLineEdit" name="tagDiskPerformerEdit"/>
+ </item>
+ <item row="7" column="1" colspan="2">
+ <widget class="TagLineEdit" name="tagDiscIdEdit">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="tagStartNumEditLabel">
+ <property name="toolTip">
+ <string/>
+ </property>
 <property name="text">
- <string>Year:</string>
+ <string>Start num:</string>
 </property>
 <property name="buddy">
- <cstring>tagYearEdit</cstring>
+ <cstring>tagStartNumEdit</cstring>
 </property>
 </widget>
 </item>
- <item row="1" column="1">
+ <item row="4" column="1" colspan="2">
+ <widget class="TagLineEdit" name="tagAlbumEdit"/>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel" name="tagDiscIdEditLabel">
+ <property name="text">
+ <string>Disc ID:</string>
+ </property>
+ <property name="buddy">
+ <cstring>tagDiscIdEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="2">
+ <widget class="TagLineEdit" name="tagGenreEdit"/>
+ </item>
+ <item row="1" column="1" colspan="2">
 <widget class="TagLineEdit" name="tagYearEdit">
 <property name="minimum" stdset="0">
 <number>1900</number>
@@ -190,81 +220,72 @@
 </property>
 </widget>
 </item>
- <item row="2" column="0">
- <widget class="QLabel" name="tagArtistEditLabel">
+ <item row="0" column="0">
+ <widget class="QLabel" name="tagGenreEditLabel">
 <property name="text">
- <string>Artist:</string>
+ <string>Genre:</string>
 </property>
 <property name="buddy">
- <cstring>tagArtistEdit</cstring>
+ <cstring>tagGenreEdit</cstring>
 </property>
 </widget>
 </item>
- <item row="2" column="1">
- <widget class="TagLineEdit" name="tagArtistEdit"/>
+ <item row="5" column="1" colspan="2">
+ <widget class="MultiValuesSpinBox" name="tagStartNumEdit">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ </widget>
 </item>
- <item row="3" column="0">
- <widget class="QLabel" name="tagAlbumEditLabel">
+ <item row="2" column="0">
+ <widget class="QLabel" name="tagArtistEditLabel">
 <property name="text">
- <string>Album:</string>
+ <string>Artist:</string>
 </property>
 <property name="buddy">
- <cstring>tagAlbumEdit</cstring>
+ <cstring>tagArtistEdit</cstring>
 </property>
 </widget>
 </item>
- <item row="3" column="1">
- <widget class="TagLineEdit" name="tagAlbumEdit"/>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="tagStartNumEditLabel">
- <property name="toolTip">
- <string/>
- </property>
+ <item row="8" column="0">
+ <widget class="QLabel" name="codepageComboLabel">
 <property name="text">
- <string>Start num:</string>
+ <string>Codepage:</string>
 </property>
 <property name="buddy">
- <cstring>tagStartNumEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="MultiValuesSpinBox" name="tagStartNumEdit">
- <property name="minimum">
- <number>1</number>
+ <cstring>codepageCombo</cstring>
 </property>
 </widget>
 </item>
- <item row="5" column="0">
- <widget class="QLabel" name="tagDiscIdEditLabel">
+ <item row="1" column="0">
+ <widget class="QLabel" name="tagYearEditLabel">
 <property name="text">
- <string>Disc ID:</string>
+ <string>Year:</string>
 </property>
 <property name="buddy">
- <cstring>tagDiscIdEdit</cstring>
+ <cstring>tagYearEdit</cstring>
 </property>
 </widget>
 </item>
- <item row="5" column="1">
- <widget class="TagLineEdit" name="tagDiscIdEdit">
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
+ <item row="2" column="1" colspan="2">
+ <widget class="TagLineEdit" name="tagArtistEdit"/>
 </item>
- <item row="6" column="0">

flacon-5.0.0.tar.gz/gui/tageditor Added

flacon-5.0.0.tar.gz/gui/tageditor/tageditor.cpp Added

@@ -0,0 +1,313 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2018
+ * 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 "tageditor.h"
+#include "ui_tageditor.h"
+
+#include <QLabel>
+#include <QGridLayout>
+#include <QDebug>
+
+#include "gui/controls.h"
+
+#include "track.h"
+#include "disk.h"
+
+
+/************************************************
+ *
+ ************************************************/
+template <class Control>
+void initControlValue(const QList<Track*> &tracks, const QList<Control*> controls)
+{
+ foreach (auto *control, controls)
+ {
+ QSet<QString> values;
+ foreach(Track *track, tracks)
+ {
+ values << track->tag(control->tagId());
+ }
+
+ control->setMultiValue(values);
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void initControlValue(const QList<Track*> &tracks, const QList<TagSpinBox*> controls)
+{
+ foreach (auto *control, controls)
+ {
+ QSet<int> values;
+ foreach(Track *track, tracks)
+ {
+ values << track->tag(control->tagId()).toInt();
+ }
+
+ control->setMultiValue(values);
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+TagEditor::TagEditor(const QList<Track*> &tracks, const QList<Disk *> &disks, QWidget *parent):
+ QDialog(parent),
+ ui(new Ui::TagEditor),
+ mTracks(tracks),
+ mDisks(disks),
+ mStartTrackSpin(nullptr)
+{
+ ui->setupUi(this);
+
+ addLineEdit(TagId::Artist, tr("Artist:", "Music tag name"));
+ addLineEdit(TagId::AlbumArtist, tr("Album performer:", "Music tag name"));
+ addLineEdit(TagId::Album, tr("Album:", "Music tag name"));
+ addLineEdit(TagId::Genre, tr("Genre:", "Music tag name"));
+ addLineEdit(TagId::Date, tr("Year:", "Music tag name"));
+
+
+ mStartTrackSpin = new MultiValuesSpinBox(this);
+ mStartTrackSpin->setMinimum(1);
+ mStartTrackSpin->setMaximum(99);
+
+ TagSpinBox *trackCountSpin = new TagSpinBox(this);
+ trackCountSpin->setMinimum(1);
+ trackCountSpin->setMaximum(99);
+ trackCountSpin->setTagId(TagId::TrackCount);
+ this->add2Widget(mStartTrackSpin, trackCountSpin, tr("Start track number:", "Music tag name"));
+
+ addIntEditNumCount(TagId::DiskNum, TagId::DiskCount, tr("Disk number:", "Music tag name"));
+
+ addLineEdit(TagId::Title, tr("Track title:", "Music tag name"));
+ addTextEdit(TagId::Comment, tr("Comment:", "Music tag name"));
+
+ // Set values ______________________________________________
+ initControlValue(tracks, this->findChildren<TagLineEdit *>());
+ initControlValue(tracks, this->findChildren<TagTextEdit *>());
+ initControlValue(tracks, this->findChildren<TagSpinBox *>());
+
+ QSet<int> values;
+ foreach(Disk *disk, disks)
+ {
+ values << disk->startTrackNum();
+ }
+
+ mStartTrackSpin->setMultiValue(values);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+TagEditor::~TagEditor()
+{
+ delete ui;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+template <class Control>
+void setValue(const QList<Track*> &tracks, const QList<Control*> controls)
+{
+ foreach (Control *edit, controls)
+ {
+ if (!edit->isModified())
+ continue;
+
+ foreach (Track *track, tracks)
+ {
+ track->setTag(edit->tagId(), edit->text());
+ }
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void setValue(const QList<Track*> &tracks, const QList<TagSpinBox*> controls)
+{
+ foreach (TagSpinBox *edit, controls)
+ {
+ if (!edit->isModified())
+ continue;
+
+ foreach (Track *track, tracks)
+ {
+ track->setTag(edit->tagId(), edit->text());
+ }
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TagEditor::done(int res)
+{
+ if (!res)
+ {
+ QDialog::done(res);
+ return;
+ }
+
+ setValue(mTracks, this->findChildren<TagLineEdit *>());
+ setValue(mTracks, this->findChildren<TagTextEdit *>());
+ setValue(mTracks, this->findChildren<TagSpinBox *>());
+
+
+ if (mStartTrackSpin->isModified())
+ {
+ foreach (Disk *disk, mDisks)
+ {
+ disk->setStartTrackNum(mStartTrackSpin->value());
+ }
+ }
+
+ QDialog::done(res);
+}
+
+

flacon-5.0.0.tar.gz/gui/tageditor/tageditor.h Added

@@ -0,0 +1,66 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2018
+ * 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 TAGEDITOR_H
+#define TAGEDITOR_H
+
+#include <QDialog>
+#include <QList>
+#include "tags.h"
+
+class Track;
+class Disk;
+class MultiValuesSpinBox;
+
+
+namespace Ui {
+class TagEditor;
+}
+
+class TagEditor : public QDialog
+{
+ Q_OBJECT
+
+public:
+ explicit TagEditor(const QList<Track*> &tracks, const QList<Disk *> &disks, QWidget *parent = 0);
+ ~TagEditor();
+
+public slots:
+ void done(int res) override;
+
+private:
+ Ui::TagEditor *ui;
+ void add2Widget(QWidget *widget1, QWidget *widget2, const QString &label);
+ void addLineEdit(TagId tagId, const QString &label);
+ void addTextEdit(TagId tagId, const QString &label);
+ void addIntEdit(TagId tagId, const QString &label);
+ void addIntEditNumCount(TagId numTagId, TagId cntTagId, const QString &numLabel);
+ const QList<Track*> mTracks;
+ const QList<Disk *> mDisks;
+ MultiValuesSpinBox *mStartTrackSpin;
+};
+
+#endif // TAGEDITOR_H

flacon-5.0.0.tar.gz/gui/tageditor/tageditor.ui Added

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TagEditor</class>
+ <widget class="QDialog" name="TagEditor">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string comment="Dialog title">Edit tags</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QGridLayout" name="layout"/>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>TagEditor</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>TagEditor</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>

flacon-4.1.0.tar.gz/gui/trackview.cpp -> flacon-5.0.0.tar.gz/gui/trackview.cpp Changed

@@ -38,6 +38,7 @@
 
 #include <QDebug>
 
+#include "gui/tageditor/tageditor.h"
 
 /************************************************
 
@@ -66,7 +67,7 @@
 this->setAttribute(Qt::WA_MacShowFocusRect, false);
 
 // Context menu ....................................
- setContextMenuPolicy(Qt::DefaultContextMenu);
+ setContextMenuPolicy(Qt::CustomContextMenu);
 
 header()->setContextMenuPolicy(Qt::CustomContextMenu);
 connect(header(), SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(headerContextMenu(QPoint)));
@@ -82,9 +83,12 @@
 QModelIndexList idxs = selectionModel()->selectedIndexes();
 foreach(QModelIndex index, idxs)
 {
- Track *track = mModel->trackByIndex(index);
- if (track)
- res << track;
+ if (index.column() == 0)
+ {
+ Track *track = mModel->trackByIndex(index);
+ if (track)
+ res << track;
+ }
 }
 
 return res;
@@ -147,6 +151,60 @@
 
 
 /************************************************
+ *
+ ************************************************/
+void TrackView::downloadStarted(const Disk &disk)
+{
+ mModel->downloadStarted(disk);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TrackView::downloadFinished(const Disk &disk)
+{
+ mModel->downloadFinished(disk);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TrackView::update(const Track &track)
+{
+ QModelIndex idx = mModel->index(track, 0);
+ QTreeView::update(idx);
+
+ int cnt = mModel->columnCount(idx.parent());
+ for (int i=1; i<cnt; ++i)
+ QTreeView::update(mModel->index(track, i));
+
+ QTreeView::update(idx.parent());
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TrackView::update(const Disk &disk)
+{
+ QModelIndex idx = mModel->index(disk, 0);
+ QTreeView::update(idx);
+
+ int rows = mModel->rowCount(idx);
+ int cols = mModel->columnCount(idx);
+ for (int r=0; r<rows; ++r)
+ {
+ for (int c=0; c<cols; ++c)
+ {
+ QTreeView::update(mModel->index(r, c, idx));
+ }
+ }
+}
+
+
+/************************************************
 
 ************************************************/
 void TrackView::headerContextMenu(QPoint pos)
@@ -190,13 +248,12 @@
 
 
 QMenu menu;
-
- foreach(TagSet *tags, disk->tagSets())
+ foreach (const Disk::TagSet &tags, disk->tagSets())
 {
- TagSetAction *act = new TagSetAction(tags->title(), &menu, disk, tags);
+ QAction *act = new QAction(tags.name, &menu);
 act->setCheckable(true);
- act->setChecked(tags->uri() == disk->tagsUri());
- connect(act, SIGNAL(triggered()), this, SLOT(activateTrackSet()));
+ act->setChecked(tags.uri == disk->tagsUri());
+ connect(act, &QAction::triggered, [disk, tags](){ disk->activateTagSet(tags.uri); });
 menu.addAction(act);
 }
 
@@ -204,13 +261,13 @@
 
 QAction *act;
 
- act = new DiskAction(tr("Select another cue file"), &menu, disk);
- connect(act, SIGNAL(triggered()), this, SLOT(emitSelectCueFile()));
+ act = new QAction(tr("Select another CUE file…"), &menu);
+ connect(act, &QAction::triggered, [this, disk] { this->selectCueFile(disk);});
 menu.addAction(act);
 
 act = new QAction(tr("Get data from CDDB"), &menu);
- connect(act, SIGNAL(triggered()), disk, SLOT(downloadInfo()));
 act->setEnabled(disk->canDownloadInfo());
+ connect(act, &QAction::triggered, [this, disk](){ emit downloadInfo(disk);});
 menu.addAction(act);
 
 QPoint vpPos = viewport()->pos() + visualRect(index).topLeft();
@@ -222,17 +279,6 @@
 /************************************************
 
 ************************************************/
-void TrackView::emitSelectCueFile()
-{
- DiskAction *act = qobject_cast<DiskAction*>(sender());
- if (act && act->disk())
- emit selectCueFile(act->disk());
-}
-
-
-/************************************************
-
- ************************************************/
 void TrackView::emitSelectAudioFile(const QModelIndex &index, const QRect &buttonRect)
 {
 Q_UNUSED(buttonRect);
@@ -243,17 +289,6 @@
 
 
 /************************************************
-
- ************************************************/
-void TrackView::emitSelectAudioFile()
-{
- DiskAction *act = qobject_cast<DiskAction*>(sender());
- if (act && act->disk())
- emit selectAudioFile(act->disk());
-}
-
-
-/************************************************
 *
 ************************************************/
 void TrackView::emitSelectCoverImage(const QModelIndex &index)
@@ -302,75 +337,6 @@
 /************************************************
 
 ************************************************/
-void TrackView::contextMenuEvent(QContextMenuEvent *event)
-{
- event->ignore();
-
- QModelIndex index = indexAt(event->pos());
- if (!index.isValid())
- return;
-
- Disk *disk = 0;
- QModelIndex diskIndex;
-
- Track *track = mModel->trackByIndex(index);
- if (track)
- {
- disk = track->disk();
- diskIndex = index.parent();
- }
- else
- {
- disk = mModel->diskByIndex(index);
- if (disk)
- diskIndex = index;
- }
-
- if (!disk)
- return;
-
-
- QMenu menu;
- QMenu editMenu(tr("Edit"), &menu);
-

flacon-4.1.0.tar.gz/gui/trackview.h -> flacon-5.0.0.tar.gz/gui/trackview.h Changed

@@ -58,17 +58,23 @@
 QList<Track*> selectedTracks() const;
 QList<Disk*> selectedDisks() const;
 
+ TrackViewModel *model() const { return mModel; }
+
 public slots:
 void layoutChanged();
 void selectDisk(const Disk *disk);
+ void downloadStarted(const Disk &disk);
+ void downloadFinished(const Disk &disk);
+ void update(const Track &track);
+ void update(const Disk &disk);
 
 signals:
 void selectCueFile(Disk *disk);
 void selectAudioFile(Disk *disk);
 void selectCoverImage(Disk *disk);
+ void downloadInfo(Disk *disk);
 
 protected:
- void contextMenuEvent(QContextMenuEvent *event);
 void drawBranches(QPainter *painter, const QRect &rect, const QModelIndex &index) const;
 void keyPressEvent(QKeyEvent *event);
 
@@ -77,13 +83,10 @@
 void showHideColumn(bool show);
 
 void showTrackMenu(const QModelIndex &index, const QRect &buttonRect);
- void emitSelectCueFile();
 void emitSelectAudioFile(const QModelIndex &index, const QRect &buttonRect);
- void emitSelectAudioFile();
 void emitSelectCoverImage(const QModelIndex &index);
 
 void openEditor();
- void activateTrackSet();
 
 private:
 TrackViewModel *mModel;

flacon-4.1.0.tar.gz/gui/trackviewdelegate.cpp -> flacon-5.0.0.tar.gz/gui/trackviewdelegate.cpp Changed

@@ -135,16 +135,15 @@
 mCache(new TrackViewCache),
 mDiskHeightHint(0)
 {
- mTrackBtnPix = loadIcon("cue-button").pixmap(BUTTON_SIZE, BUTTON_SIZE);
- mAudioBtnPix = loadIcon("audio-button").pixmap(BUTTON_SIZE, BUTTON_SIZE);
- mWarnPix = loadIcon("warning", false).pixmap(MARK_HEIGHT, MARK_HEIGHT);
- mOkPix = loadIcon("track-ok").pixmap(LINE_MARK_HEIGHT, LINE_MARK_HEIGHT);
- mErrorPix = loadIcon("track-cancel", false).pixmap(LINE_MARK_HEIGHT, LINE_MARK_HEIGHT);
- mNoCoverImg = QImage(":noCover");
+ mTrackBtnPix = loadIcon("cue-button").pixmap(BUTTON_SIZE, BUTTON_SIZE);
+ mAudioBtnPix = loadIcon("audio-button").pixmap(BUTTON_SIZE, BUTTON_SIZE);
+ mDiskErrorPix = loadIcon("error", false).pixmap(MARK_HEIGHT, MARK_HEIGHT);
+ mDiskWarnPix = loadIcon("warning", false).pixmap(MARK_HEIGHT, MARK_HEIGHT);
+ mTrackOkPix = loadIcon("track-ok").pixmap(LINE_MARK_HEIGHT, LINE_MARK_HEIGHT);
+ mTrackErrorPix = loadIcon("track-cancel", false).pixmap(LINE_MARK_HEIGHT, LINE_MARK_HEIGHT);
+ mNoCoverImg = QImage(":noCover");
 
 mDownloadMovie.setFileName(":wait");
- connect(project, SIGNAL(downloadingStarted(DataProvider*)), this, SLOT(downloadingStarted(DataProvider*)));
- connect(project, SIGNAL(downloadingFinished(DataProvider*)), this, SLOT(downloadingFinished(DataProvider*)));
 connect(&mDownloadMovie, SIGNAL(updated(QRect)), this, SLOT(movieUpdated()));
 }
 
@@ -208,8 +207,8 @@
 return;
 }
 
-
- if (type == TrackViewModel::DiskItem && index.column() == 0)
+ // TrackViewModel::DiskItem
+ if (index.column() == 0)
 {
 QColor bgColor = mTrackView->palette().base().color();
 painter->fillRect(opt.rect, bgColor);
@@ -246,53 +245,53 @@
 int progress = index.data(TrackViewModel::RolePercent).toInt();
 bool showProgress = false;
 
- switch (index.data(TrackViewModel::RoleStatus).toInt())
+ switch (TrackState(index.data(TrackViewModel::RoleStatus).toInt()))
 {
- case Track::NotRunning:
+ case TrackState::NotRunning:
 txt = "";
 break;
 
- case Track::Canceled:
+ case TrackState::Canceled:
 txt = "";
 break;
 
- case Track::Error:
+ case TrackState::Error:
 txt = tr("Error");
- icon = &mErrorPix;
+ icon = &mTrackErrorPix;
 break;
 
- case Track::Aborted:
+ case TrackState::Aborted:
 txt = tr("Aborted");
 break;
 
- case Track::OK:
+ case TrackState::OK:
 txt = tr("OK");
- icon = &mOkPix;
+ icon = &mTrackOkPix;
 break;
 
- case Track::Splitting:
+ case TrackState::Splitting:
 txt = tr("Extracting");
 showProgress = true;
 break;
 
- case Track::Encoding:
+ case TrackState::Encoding:
 txt = tr("Encoding");
 showProgress = true;
 break;
 
- case Track::Queued:
+ case TrackState::Queued:
 txt = tr("Queued");
 break;
 
- case Track::CalcGain:
+ case TrackState::CalcGain:
 txt = tr("Calculate gain");
 break;
 
- case Track::WaitGain:
+ case TrackState::WaitGain:
 txt = tr("Wait gain");
 break;
 
- case Track::WriteGain:
+ case TrackState::WriteGain:
 txt = tr("Write gain");
 break;
 }
@@ -404,7 +403,7 @@
 QRect tFileRect(l, tTop, windowRect.width(), th);
 QRect aFileRect(l, aTop, windowRect.width(), th);
 
- tFileRect = drawFile(index.data(TrackViewModel::RoleTitle).toString(), tFileRect, painter);
+ tFileRect = drawFile(index.data(TrackViewModel::RoleTagSetTitle).toString(), tFileRect, painter);
 QFileInfo fi(index.data(TrackViewModel::RoleAudioFileName).toString());
 aFileRect = drawFile(fi.fileName(), aFileRect, painter);
 
@@ -446,12 +445,18 @@
 
 if (cache->isWaiting)
 {
+ mDownloadMovie.start();
 painter->drawPixmap(markRect, mDownloadMovie.currentPixmap());
 cache->markBtn = markRect;
 }
 else if (!index.data(TrackViewModel::RoleCanConvert).toBool())
 {
- painter->drawPixmap(markRect, mWarnPix);
+ painter->drawPixmap(markRect, mDiskErrorPix);
+ cache->markBtn = markRect;
+ }
+ else if (index.data(TrackViewModel::RoleHasWarnings).toBool())
+ {
+ painter->drawPixmap(markRect, mDiskWarnPix);
 cache->markBtn = markRect;
 }
 else
@@ -627,10 +632,16 @@
 
 if (cache->markBtn.contains(m))
 {
- QToolTip::showText(
+ QString err = view->model()->data(index, TrackViewModel::RoleDiskErrors).toString();
+ QString warn = view->model()->data(index, TrackViewModel::RoleDiskWarnings).toStringList().join(" ");
+
+ if (!err.isEmpty() || !warn.isEmpty())
+ {
+ QToolTip::showText(
 event->globalPos(),
- view->model()->data(index, TrackViewModel::RoleDiskWarning).toString(),
+ warn + (!warn.isEmpty() && !err.isEmpty() ? " <hr> " : "") + err,
 view);
+ }
 return true;
 }
 return false;
@@ -665,24 +676,6 @@
 /************************************************
 
 ************************************************/
-void TrackViewDelegate::downloadingStarted(DataProvider *)
-{
- mDownloadMovie.start();
-}
-
-
-/************************************************
-
- ************************************************/
-void TrackViewDelegate::downloadingFinished(DataProvider *provider)
-{
- project->emitDiskChanged(provider->disk());
-}
-
-
-/************************************************
-
- ************************************************/
 QFont TrackViewDelegate::titleFont(const QFont &font) const
 {
 QFont res = font;

flacon-4.1.0.tar.gz/gui/trackviewdelegate.h -> flacon-5.0.0.tar.gz/gui/trackviewdelegate.h Changed

flacon-4.1.0.tar.gz/gui/trackviewmodel.cpp -> flacon-5.0.0.tar.gz/gui/trackviewmodel.cpp Changed

@@ -33,6 +33,32 @@
 #include <QDebug>
 #include <QSet>
 
+struct CacheTrackData
+{
+ CacheTrackData():
+ state(TrackState::NotRunning),
+ percent(0),
+ diskNum(-1),
+ trackNum(-1)
+ {
+ }
+
+ TrackState state;
+ Percent percent;
+ DiskNum diskNum;
+ TrackNum trackNum;
+};
+
+
+class TrackViewModel::Cache
+{
+public:
+ Cache() {}
+ QSet<DiskNum> downloadedDisks;
+ QHash<Track, CacheTrackData> tracks;
+};
+
+
 class IndexData
 {
 public:
@@ -54,17 +80,11 @@
 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; }
@@ -99,18 +119,35 @@
 
 
 /************************************************
+ *
+ ************************************************/
+inline uint qHash(const Track &track, uint seed) {
+ return qHash(QPair<int, QString>(track.trackNum(), track.cueFileName()), seed);
+}
+
+
+/************************************************
 
 ************************************************/
 TrackViewModel::TrackViewModel(TrackView *parent) :
 QAbstractItemModel(parent),
+ mCache(new Cache()),
 mView(parent)
 {
- connect(project, SIGNAL(diskChanged(Disk*)), this, SLOT(diskDataChanged(Disk*)));
- connect(project, SIGNAL(trackChanged(int,int)), this, SLOT(trackDataChanged(int,int)));
+ connect(project, &Project::diskChanged,
+ this, &TrackViewModel::diskDataChanged);
+
 connect(project, SIGNAL(layoutChanged()), this, SIGNAL(layoutChanged()));
 connect(project, SIGNAL(afterRemoveDisk()), this, SIGNAL(layoutChanged()));
+}
 
- connect(project, SIGNAL(trackProgress(const Track*)), this, SLOT(trackProgressChanged(const Track*)));
+
+/************************************************
+ *
+ ************************************************/
+TrackViewModel::~TrackViewModel()
+{
+ delete mCache;
 }
 
 
@@ -158,9 +195,9 @@
 /************************************************
 
 ************************************************/
-QModelIndex TrackViewModel::index(const Disk *disk, int col) const
+QModelIndex TrackViewModel::index(const Disk &disk, int col) const
 {
- const int diskNum = project->indexOf(disk);
+ const int diskNum = project->indexOf(&disk);
 if (diskNum > -1 && diskNum < rowCount(QModelIndex()))
 return index(diskNum, col, QModelIndex());
 
@@ -169,19 +206,35 @@
 
 
 /************************************************
-
+ *
 ************************************************/
-QModelIndex TrackViewModel::index(const Track *track, int col) const
+QModelIndex TrackViewModel::index(const Track &track, int col) const
 {
- QModelIndex diskIndex = index(track->disk());
- if (!diskIndex.isValid())
- return QModelIndex();
+ CacheTrackData &cache = mCache->tracks[track];
 
- int trackNum = track->index();
- if (trackNum > -1 && trackNum < rowCount(diskIndex))
- return index(trackNum, col, diskIndex);
- else
- return QModelIndex();
+ const IndexData indexData(cache.diskNum, cache.trackNum);
+ if (indexData.track() && *indexData.track() == track)
+ {
+ return index(cache.trackNum, col, index(cache.diskNum, 0));
+ }
+
+ // Update cache
+ for (int d=0; d<rowCount(); ++d)
+ {
+ QModelIndex diskIndex = index(d, 0);
+ for (int t=0; t<rowCount(diskIndex); ++t)
+ {
+ IndexData indexData(d, t);
+ if (indexData.track() && *indexData.track() == track)
+ {
+ cache.diskNum = d;
+ cache.trackNum = t;
+ return index(cache.trackNum, col, diskIndex);
+ }
+ }
+ }
+
+ return QModelIndex();
 }
 
 
@@ -258,6 +311,7 @@
 }
 }
 
+ emit dataChanged(index, index, QVector<int>() << role);
 return true;
 }
 
@@ -323,15 +377,16 @@
 
 }
 
+
 switch (role)
 {
 case RoleItemType: return TrackItem;
- case RolePercent: return track->progress();
- case RoleStatus: return track->status();
+ case RolePercent: return mCache->tracks[*track].percent;
+ case RoleStatus: return int(mCache->tracks[*track].state);
 case RoleTracknum: return track->trackNum();
 case RoleDuration: return track->duration();
 case RoleTitle: return track->title();
- case RoleArtist: return track->artist();
+ case RoleArtist: return track->tag(TagId::AlbumArtist);
 case RoleAlbum: return track->album();
 case RoleComment: return track->album();
 case RoleFileName: return track->resultFileName();
@@ -364,7 +419,7 @@
 
 case TrackView::ColumnArtist:
 for (int i=0; i<disk->count(); ++i)
- values << disk->track(i)->artist();
+ values << disk->track(i)->tag(TagId::AlbumArtist);
 break;
 
 case TrackView::ColumnAlbum:
@@ -389,15 +444,17 @@
 switch (role)
 {
 case RoleItemType: return DiskItem;
- case RoleTitle: return disk->tagsTitle();
+ case RoleTagSetTitle: return disk->tagSetTitle();
 case RoleAudioFileName: return disk->audioFileName();
+ case RoleHasWarnings: return !disk->warnings().isEmpty();
 case RoleCanConvert: return disk->canConvert();
- case RoleIsDownloads: return disk->isDownloads();
+ case RoleIsDownloads: return mCache->downloadedDisks.contains(index.row());
 case RoleCoverFile: return disk->coverImageFile();
 case RoleCoverImg: return disk->coverImagePreview();
 case RoleCueFilePath: return disk->cueFile();

flacon-4.1.0.tar.gz/gui/trackviewmodel.h -> flacon-5.0.0.tar.gz/gui/trackviewmodel.h Changed

@@ -28,6 +28,7 @@
 #define TRACKVIEWMODEL_H
 
 #include <QAbstractItemModel>
+#include <QSet>
 
 #include "disk.h"
 class Project;
@@ -43,20 +44,26 @@
 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 parent(const QModelIndex &child) const;
+ virtual ~TrackViewModel();
 
- QVariant data(const QModelIndex &index, int role) const;
- bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex &child) const override;
 
- int columnCount(const QModelIndex &parent) const;
- int rowCount(const QModelIndex &parent) const;
- Qt::ItemFlags flags(const QModelIndex &index) const;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+ bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+
+ int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
 
 TrackView *view() const { return mView; }
 
+ QModelIndex index(const Disk &disk, int col = 0) const;
+ QModelIndex index(const Track &track, int col) const;
+
+ Disk *diskByIndex(const QModelIndex &index);
+ Track *trackByIndex(const QModelIndex &index);
 
 public slots:
 
@@ -78,6 +85,8 @@
 RoleComment,
 RoleFileName,
 RoleAudioFileName,
+ RoleTagSetTitle,
+ RoleHasWarnings,
 RoleCanConvert,
 RoleIsDownloads,
 RoleItemID,
@@ -86,24 +95,28 @@
 RoleCoverImg,
 RoleCueFilePath,
 RoleAudioFilePath,
- RoleDiskWarning,
+ RoleDiskWarnings,
+ RoleDiskErrors,
+ RoleDiskPerformer
 };
 
- Disk *diskByIndex(const QModelIndex &index);
- Track *trackByIndex(const QModelIndex &index);
+
+
+public slots:
+ void downloadStarted(const Disk &disk);
+ void downloadFinished(const Disk &disk);
+
+ void trackProgressChanged(const Track &track, TrackState state, Percent percent);
 
 private slots:
- void diskDataChanged(Disk *disk);
- void trackDataChanged(int disk, int track);
- void trackProgressChanged(const Track *track);
+ void diskDataChanged(const Disk *disk);
 
 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;
-
+ class Cache;
+ mutable Cache *mCache;
 TrackView *mView;
 };

flacon-4.1.0.tar.gz/images/icons.qrc -> flacon-5.0.0.tar.gz/images/icons.qrc Changed

@@ -29,6 +29,7 @@
 
 <file alias="track-cancel">icons/16/track-cancel.png</file>
 <file alias="warning">icons/16/warning.png</file>
+ <file alias="error">icons/16/error.png</file>
 </qresource>
 
 <qresource prefix="22">
@@ -60,6 +61,7 @@
 
 <file alias="track-cancel">icons/22/track-cancel.png</file>
 <file alias="warning">icons/22/warning.png</file>
+ <file alias="error">icons/22/error.png</file>
 </qresource>
 
 <qresource prefix="24">
@@ -91,6 +93,7 @@
 
 <file alias="track-cancel">icons/24/track-cancel.png</file>
 <file alias="warning">icons/24/warning.png</file>
+ <file alias="error">icons/24/error.png</file>
 </qresource>
 
 <qresource prefix="32">
@@ -122,6 +125,7 @@
 
 <file alias="track-cancel">icons/32/track-cancel.png</file>
 <file alias="warning">icons/32/warning.png</file>
+ <file alias="error">icons/32/error.png</file>
 </qresource>
 
 <qresource prefix="48">
@@ -153,6 +157,7 @@
 
 <file alias="track-cancel">icons/48/track-cancel.png</file>
 <file alias="warning">icons/48/warning.png</file>
+ <file alias="error">icons/48/error.png</file>
 </qresource>
 
 <qresource prefix="64">
@@ -184,6 +189,7 @@
 
 <file alias="track-cancel">icons/64/track-cancel.png</file>
 <file alias="warning">icons/64/warning.png</file>
+ <file alias="error">icons/64/error.png</file>
 </qresource>
 
 <qresource prefix="128">
@@ -215,6 +221,7 @@
 
 <file alias="track-cancel">icons/128/track-cancel.png</file>
 <file alias="warning">icons/128/warning.png</file>
+ <file alias="error">icons/128/error.png</file>
 </qresource>
 
 <qresource prefix="256">
@@ -246,6 +253,7 @@
 
 <file alias="track-cancel">icons/256/track-cancel.png</file>
 <file alias="warning">icons/256/warning.png</file>
+ <file alias="error">icons/256/error.png</file>
 </qresource>
 
 <qresource prefix="512">
@@ -277,6 +285,7 @@
 
 <file alias="track-cancel">icons/512/track-cancel.png</file>
 <file alias="warning">icons/512/warning.png</file>
+ <file alias="error">icons/512/error.png</file>
 </qresource>
 
 </RCC>

flacon-5.0.0.tar.gz/images/icons/128/error.png Added

flacon-4.1.0.tar.gz/images/icons/128/warning.png -> flacon-5.0.0.tar.gz/images/icons/128/warning.png Changed

flacon-5.0.0.tar.gz/images/icons/16/error.png Added

flacon-4.1.0.tar.gz/images/icons/16/warning.png -> flacon-5.0.0.tar.gz/images/icons/16/warning.png Changed

flacon-5.0.0.tar.gz/images/icons/22/error.png Added

flacon-4.1.0.tar.gz/images/icons/22/warning.png -> flacon-5.0.0.tar.gz/images/icons/22/warning.png Changed

flacon-5.0.0.tar.gz/images/icons/24/error.png Added

flacon-4.1.0.tar.gz/images/icons/24/warning.png -> flacon-5.0.0.tar.gz/images/icons/24/warning.png Changed

flacon-5.0.0.tar.gz/images/icons/256/error.png Added

flacon-4.1.0.tar.gz/images/icons/256/warning.png -> flacon-5.0.0.tar.gz/images/icons/256/warning.png Changed

flacon-5.0.0.tar.gz/images/icons/32/error.png Added

flacon-4.1.0.tar.gz/images/icons/32/warning.png -> flacon-5.0.0.tar.gz/images/icons/32/warning.png Changed

flacon-5.0.0.tar.gz/images/icons/48/error.png Added

flacon-4.1.0.tar.gz/images/icons/48/warning.png -> flacon-5.0.0.tar.gz/images/icons/48/warning.png Changed

flacon-5.0.0.tar.gz/images/icons/512/error.png Added

flacon-4.1.0.tar.gz/images/icons/512/warning.png -> flacon-5.0.0.tar.gz/images/icons/512/warning.png Changed

flacon-5.0.0.tar.gz/images/icons/64/error.png Added

flacon-4.1.0.tar.gz/images/icons/64/warning.png -> flacon-5.0.0.tar.gz/images/icons/64/warning.png Changed

flacon-5.0.0.tar.gz/images/icons/error.svg Added

flacon-4.1.0.tar.gz/images/icons/warning.svg -> flacon-5.0.0.tar.gz/images/icons/warning.svg Changed

@@ -1,47 +1,7 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 497.472 497.472" style="enable-background:new 0 0 497.472 497.472;" xml:space="preserve">
-<g transform="matrix(1.25 0 0 -1.25 0 45)">
-	<g>
-		<g>
-			<path style="fill:#FFCC4D;" d="M24.374-357.857c-20.958,0-30.197,15.223-20.548,33.826L181.421,17.928
-				c9.648,18.603,25.463,18.603,35.123,0L394.14-324.031c9.671-18.603,0.421-33.826-20.548-33.826H24.374z"/>
-			<path style="fill:#231F20;" d="M173.605-80.922c0,14.814,10.934,23.984,25.395,23.984c14.12,0,25.407-9.512,25.407-23.984
-				V-216.75c0-14.461-11.287-23.984-25.407-23.984c-14.461,0-25.395,9.182-25.395,23.984V-80.922z M171.489-289.056
-				c0,15.167,12.345,27.511,27.511,27.511c15.167,0,27.523-12.345,27.523-27.511c0-15.178-12.356-27.523-27.523-27.523
-				C183.834-316.579,171.489-304.234,171.489-289.056"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" version="1.1" width="96px" height="96px">
+<g id="surface1">
+<path style=" fill:#FFC107;" d="M 40 40 L 8 40 C 7.28125 40 6.621094 39.617188 6.265625 38.996094 C 5.910156 38.375 5.910156 37.609375 6.273438 36.992188 L 22.273438 8.992188 C 22.632813 8.378906 23.289063 8 24 8 C 24.710938 8 25.367188 8.378906 25.726563 8.992188 L 41.726563 36.992188 C 42.089844 37.609375 42.089844 38.375 41.734375 38.996094 C 41.378906 39.617188 40.714844 40 40 40 Z "/>
+<path style=" fill:#5D4037;" d="M 22 34.140625 C 22 33.871094 22.046875 33.628906 22.144531 33.394531 C 22.238281 33.167969 22.371094 32.96875 22.546875 32.804688 C 22.71875 32.636719 22.929688 32.503906 23.171875 32.410156 C 23.414063 32.320313 23.6875 32.269531 23.992188 32.269531 C 24.300781 32.269531 24.574219 32.320313 24.820313 32.410156 C 25.070313 32.503906 25.28125 32.636719 25.453125 32.804688 C 25.628906 32.96875 25.765625 33.167969 25.855469 33.394531 C 25.953125 33.628906 26 33.871094 26 34.140625 C 26 34.410156 25.953125 34.65625 25.855469 34.882813 C 25.761719 35.105469 25.628906 35.300781 25.453125 35.46875 C 25.28125 35.636719 25.070313 35.765625 24.820313 35.863281 C 24.574219 35.953125 24.300781 36 23.992188 36 C 23.6875 36 23.414063 35.953125 23.171875 35.859375 C 22.929688 35.765625 22.71875 35.636719 22.546875 35.46875 C 22.371094 35.300781 22.234375 35.105469 22.144531 34.882813 C 22.046875 34.65625 22 34.410156 22 34.140625 M 25.480469 30 L 22.507813 30 L 22.085938 18 L 25.898438 18 Z "/>
+</g>
+</svg>

flacon-4.1.0.tar.gz/images/icons2png.sh -> flacon-5.0.0.tar.gz/images/icons2png.sh Changed

flacon-4.1.0.tar.gz/inputaudiofile.cpp -> flacon-5.0.0.tar.gz/inputaudiofile.cpp Changed

@@ -45,6 +45,7 @@
 mFileName(fileName),
 mValid(false),
 mSampleRate(0),
+ mBitsPerSample(0),
 mCdQuality(false),
 mDuration(0),
 mFormat(0)
@@ -59,24 +60,23 @@
 ************************************************/
 InputAudioFile::InputAudioFile(const InputAudioFile &other)
 {
- mFileName = other.mFileName;
- mValid = other.mValid;
- mErrorString = other.mErrorString;
- mSampleRate = other.mSampleRate;
- mCdQuality = other.mCdQuality;
- mDuration = other.mDuration;
- mFormat = other.mFormat;
+ operator =(other);
 }
 
+
+/************************************************
+ *
+ ************************************************/
 InputAudioFile &InputAudioFile::operator =(const InputAudioFile &other)
 {
- mFileName = other.mFileName;
- mValid = other.mValid;
- mErrorString = other.mErrorString;
- mSampleRate = other.mSampleRate;
- mCdQuality = other.mCdQuality;
- mDuration = other.mDuration;
- mFormat = other.mFormat;
+ mFileName = other.mFileName;
+ mValid = other.mValid;
+ mErrorString = other.mErrorString;
+ mSampleRate = other.mSampleRate;
+ mBitsPerSample = other.mBitsPerSample;
+ mCdQuality = other.mCdQuality;
+ mDuration = other.mDuration;
+ mFormat = other.mFormat;
 return *this;
 }
 
@@ -101,16 +101,7 @@
 }
 
 
- mFormat = AudioFormat::formatForFile(mFileName);
- if (!mFormat)
- {
- 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;
- }
-
- Decoder dec(*mFormat);
+ Decoder dec;
 if (!dec.open(mFileName))
 {
 mErrorString = QObject::tr("File %1 is not a supported audio file. "
@@ -118,10 +109,12 @@
 mErrorString += ": " + dec.errorString();
 return false;
 }
+ mFormat = dec.audioFormat();
 
- mSampleRate = dec.wavHeader().sampleRate();
- mCdQuality = dec.wavHeader().isCdQuality();
- mDuration = dec.duration();
+ mSampleRate = dec.wavHeader().sampleRate();
+ mBitsPerSample = dec.wavHeader().bitsPerSample();
+ mCdQuality = dec.wavHeader().isCdQuality();
+ mDuration = dec.duration();
 
 return true;
 }

flacon-4.1.0.tar.gz/inputaudiofile.h -> flacon-5.0.0.tar.gz/inputaudiofile.h Changed

flacon-4.1.0.tar.gz/internet/dataprovider.cpp -> flacon-5.0.0.tar.gz/internet/dataprovider.cpp Changed

@@ -29,21 +29,18 @@
 #include "../disk.h"
 #include <QtNetwork/QNetworkAccessManager>
 
-//--------
 #include "settings.h"
 #include "project.h"
 
-
 #include <QStringList>
-
 #include <QDebug>
 #include <QTextCodec>
 
 /************************************************
 
 ************************************************/
-DataProvider::DataProvider(Disk *disk) :
- QObject(disk),
+DataProvider::DataProvider(const Disk &disk) :
+ QObject(),
 mDisk(disk)
 {
 }
@@ -87,7 +84,8 @@
 void DataProvider::get(const QNetworkRequest &request)
 {
 QNetworkReply *reply = networkAccessManager()->get(request);
- addReply(reply);
+ mReplies << reply;
+ connect(reply, SIGNAL(finished()), this, SLOT(replayFinished()));
 }
 
 
@@ -101,7 +99,7 @@
 if (reply->isOpen())
 reply->abort();
 }
- Project::error(message);
+ Messages::error(message);
 }
 
 
@@ -117,7 +115,10 @@
 switch (reply->error())
 {
 case QNetworkReply::NoError:
- dataReady(reply);
+ mResult << dataReady(reply);
+ if (isFinished())
+ emit ready(mResult);
+
 break;
 
 case QNetworkReply::OperationCanceledError:
@@ -149,17 +150,7 @@
 /************************************************
 
 ************************************************/
-void DataProvider::addReply(QNetworkReply *reply)
-{
- mReplies << reply;
- connect(reply, SIGNAL(finished()), this, SLOT(replayFinished()));
-}
-
-
-/************************************************
-
- ************************************************/
-FreeDbProvider::FreeDbProvider(Disk *disk):
+FreeDbProvider::FreeDbProvider(const Disk &disk):
 DataProvider(disk)
 {
 }
@@ -193,7 +184,7 @@
 request.setUrl(mask.arg(
 host,
 category,
- disk()->discId(),
+ disk().discId(),
 "anonimous", // Hello user
 "127.0.0.1", // Hello host
 "flacon", //Hello client name
@@ -202,14 +193,13 @@
 request.setAttribute(QNetworkRequest::User, category);
 get(request);
 }
- project->emitDownloadingStarted(this);
 }
 
 
 /************************************************
 
 ************************************************/
-void FreeDbProvider::dataReady(QNetworkReply *reply)
+QVector<Tracks> FreeDbProvider::dataReady(QNetworkReply *reply)
 {
 QString statusLine = reply->readLine();
 int status = statusLine.section(' ', 0, 0).toInt();
@@ -218,7 +208,7 @@
 switch(status)
 {
 case 210: // OK
- parse(reply);
+ return QVector<Tracks>() << parse(reply);
 break;
 
 case 401: // No such CD entry in database, skip.
@@ -228,49 +218,24 @@
 error(statusLine);
 }
 
-
- project->emitDownloadingFinished(this);
-
- if (!isFinished())
- return;
-
- if (mResult.count() == 0)
- return;
-
-
- int minDist = disk()->distance(mResult.at(0));
- int bestTagSet = 0;
-
- for (int i=1; i<mResult.count(); ++i)
- {
- int n = disk()->distance(mResult.at(i));
- if (n<minDist)
- {
- minDist = n;
- bestTagSet = i;
- }
- }
-
- for (int i=0; i<mResult.count(); ++i)
- {
- disk()->addTagSet(mResult.at(i), i == bestTagSet);
- }
-
+ return QVector<Tracks>();
 }
 
 
 /************************************************
 
 ************************************************/
-void FreeDbProvider::parse(QNetworkReply *reply)
+Tracks FreeDbProvider::parse(QNetworkReply *reply)
 {
 QByteArray category = reply->request().attribute(QNetworkRequest::User).toByteArray();
 
- TagSet res(reply->url().toString());
- res.setDiskTag(TAG_DISCID, disk()->discId());
+ Tracks res;
+ res.setUri(reply->url().toString());
 
- QByteArray artist;
 QByteArray album;
+ QByteArray year;
+ QByteArray genre;
+ QByteArray performer;
 QList<QByteArray> tracks;
 
 while (!reply->atEnd())
@@ -285,13 +250,13 @@
 
 if (key == "DYEAR")
 {
- res.setDiskTag(TAG_DATE, value, false);
+ year = value;
 continue;
 }
 
 if (key == "DGENRE")
 {
- res.setDiskTag(TAG_GENRE, value, false);
+ genre = value;
 continue;
 }
 
@@ -299,11 +264,8 @@
 {
 // The artist and disc title (in that order) separated by a "/" with a
 // single space on either side to separate it from the text.
- artist = leftPart(value, '/').trimmed();
- res.setDiskTag(TAG_PERFORMER, artist, false);
-
- album = rightPart(value, '/').trimmed();
- res.setDiskTag(TAG_ALBUM, album, false);
+ performer = leftPart(value, '/').trimmed();
+ album = rightPart(value, '/').trimmed();
 continue;
 }
 
@@ -315,19 +277,18 @@
 
 }
 
+ int n = 0;

flacon-4.1.0.tar.gz/internet/dataprovider.h -> flacon-5.0.0.tar.gz/internet/dataprovider.h Changed

@@ -31,7 +31,7 @@
 #include <QList>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
-#include "../tagset.h"
+#include "track.h"
 
 class Disk;
 class QNetworkAccessManager;
@@ -41,10 +41,10 @@
 {
 Q_OBJECT
 public:
- explicit DataProvider(Disk *disk);
+ explicit DataProvider(const Disk &disk);
 virtual ~DataProvider();
 
- Disk *disk() const { return mDisk; }
+ const Disk &disk() const { return mDisk; }
 
 bool isFinished() const;
 
@@ -55,19 +55,21 @@
 
 signals:
 void finished();
+ void ready(const QVector<Tracks> result);
 
 protected:
 void get(const QNetworkRequest &request);
 void error(const QString &message);
- virtual void dataReady(QNetworkReply *reply) = 0;
+ virtual QVector<Tracks> dataReady(QNetworkReply *reply) = 0;
 
 private slots:
 void replayFinished();
 
 private:
 QNetworkAccessManager *networkAccessManager() const;
- Disk *mDisk;
+ const Disk &mDisk;
 QList<QNetworkReply*> mReplies;
+ QVector<Tracks> mResult;
 
 void addReply(QNetworkReply* reply);
 };
@@ -76,15 +78,14 @@
 class FreeDbProvider: public DataProvider
 {
 public:
- explicit FreeDbProvider(Disk *disk);
+ explicit FreeDbProvider(const Disk &disk);
 
- void start();
+ void start() override;
 protected:
- void dataReady(QNetworkReply *reply);
+ QVector<Tracks> dataReady(QNetworkReply *reply) override;
 
 private:
- void parse(QNetworkReply *reply);
- QList<TagSet> mResult;
+ Tracks parse(QNetworkReply *reply);
 };
 
 #endif // DATAPROVIDER_H

flacon-4.1.0.tar.gz/main.cpp -> flacon-5.0.0.tar.gz/main.cpp Changed

flacon-4.1.0.tar.gz/project.cpp -> flacon-5.0.0.tar.gz/project.cpp Changed

@@ -25,7 +25,6 @@
 
 
 #include "project.h"
-//#include "disk.h"
 #include "settings.h"
 #include "cue.h"
 #include "inputaudiofile.h"
@@ -35,8 +34,6 @@
 #include <QMessageBox>
 #include <QDir>
 
-static void (*errorHandler)(const QString &msg);
-
 
 /************************************************
 
@@ -101,11 +98,7 @@
 
 mDisks.insert(index, disk);
 
- //disc.setProject(self)
- //self.connect(disc, SIGNAL("downloadStarted()"), self._discDownlaodStarted)
- //self.connect(disc, SIGNAL("downloadFinished()"), self._discDownlaodFinished)
 emit layoutChanged();
-
 return index;
 }
 
@@ -124,8 +117,6 @@
 
 emit afterRemoveDisk();
 }
-
- //emit layoutChanged();
 }
 
 
@@ -143,9 +134,9 @@
 ************************************************/
 bool Project::diskExists(const QString &cueUri)
 {
- foreach (Disk *d, mDisks)
+ foreach (const Disk *d, mDisks)
 {
- if (!d->tagSets().isEmpty() && d->tagSets().first()->uri() == cueUri)
+ if (d->cueFile() == cueUri)
 return true;
 }
 return false;
@@ -153,25 +144,6 @@
 
 
 /************************************************
- *
- ************************************************/
-void Project::error(const QString &msg)
-{
- if (errorHandler)
- errorHandler(msg);
-}
-
-
-/************************************************
- *
- ************************************************/
-void Project::installErrorHandler(void (*handler)(const QString &))
-{
- errorHandler = handler;
-}
-
-
-/************************************************
 
 ************************************************/
 Disk *Project::addAudioFile(const QString &fileName, bool showErrors)
@@ -189,7 +161,7 @@
 if (!audio.isValid())
 {
 if (showErrors)
- Project::error(audio.errorString());
+ Messages::error(audio.errorString());
 
 return 0;
 }
@@ -209,32 +181,27 @@
 DiskList Project::addCueFile(const QString &fileName, bool showErrors)
 {
 DiskList res;
- CueReader cueReader(fileName);
- if (cueReader.isValid())
+ try
 {
- for (int i=0; i<cueReader.diskCount(); ++i)
+ QVector<CueDisk> disks = CueReader().load(fileName);
+
+ for (int i=0; i<disks.count(); ++i)
 {
- if (diskExists(cueReader.disk(i).uri()))
+ if (diskExists(disks.at(i).uri()))
 continue;
 
 Disk *disk = new Disk();
- disk->loadFromCue(cueReader.disk(i));
+ disk->loadFromCue(disks.at(i));
 mDisks << disk;
 res << disk;
 }
 emit layoutChanged();
 }
- else
+ catch (FlaconError &err)
 {
- foreach(Disk *disk, res)
- {
- mDisks.removeAll(disk);
- disk->deleteLater();
- }
-
 emit layoutChanged();
 if (showErrors)
- Project::error(cueReader.errorString());
+ Messages::error(err.message());
 }
 
 return res;
@@ -253,43 +220,7 @@
 /************************************************
 
 ************************************************/
-void Project::emitTrackChanged(int disk, int track) const
-{
- emit trackChanged(disk, track);
-}
-
-
-/************************************************
-
- ************************************************/
-void Project::emitTrackProgress(const Track *track) const
-{
- emit trackProgress(track);
-}
-
-
-/************************************************
-
- ************************************************/
 void Project::emitLayoutChanged() const
 {
 emit layoutChanged();
 }
-
-
-/************************************************
- *
- ************************************************/
-void Project::emitDownloadingStarted(DataProvider *provider) const
-{
- emit downloadingStarted(provider);
-}
-
-
-/************************************************
- *
- ************************************************/
-void Project::emitDownloadingFinished(DataProvider *provider) const
-{
- emit downloadingFinished(provider);
-}

flacon-4.1.0.tar.gz/project.h -> flacon-5.0.0.tar.gz/project.h Changed

@@ -52,18 +52,10 @@
 void removeDisk(const QList<Disk*> *disks);
 
 void emitDiskChanged(Disk *disk) const;
- void emitTrackChanged(int disk, int track) const;
- void emitTrackProgress(const Track *track) const;
 void emitLayoutChanged() const;
- void emitDownloadingStarted(DataProvider *provider) const;
- void emitDownloadingFinished(DataProvider *provider) const;
-
 
 bool diskExists(const QString &cueUri);
 
- static void error(const QString &msg);
- static void installErrorHandler(void (*handler)(const QString &msg));
-
 public slots:
 void clear();
 Disk *addAudioFile(const QString &fileName, bool showErrors);
@@ -71,13 +63,9 @@
 
 signals:
 void diskChanged(Disk *disk) const;
- void trackChanged(int disk, int track) const;
- void trackProgress(const Track *track) const;
 void layoutChanged() const;
 void beforeRemoveDisk(Disk *disk);
 void afterRemoveDisk();
- void downloadingStarted(DataProvider *provider) const;
- void downloadingFinished(DataProvider *provider) const;
 
 private:
 explicit Project(QObject *parent = 0);

flacon-4.1.0.tar.gz/settings.cpp -> flacon-5.0.0.tar.gz/settings.cpp Changed

@@ -29,12 +29,15 @@
 #include "settings.h"
 #include "inputaudiofile.h"
 #include "outformat.h"
+#include "converter/resampler.h"
+
 #include <QDir>
 #include <QDebug>
 #include <QProcessEnvironment>
 #include <QDir>
 #include <QStandardPaths>
 #include <QCoreApplication>
+#include <QMetaEnum>
 
 #ifdef Q_OS_WIN
 #define PATH_ENV_SEPARATOR ';'
@@ -134,12 +137,17 @@
 
 // Cover image **************************
 setDefaultValue(Cover_Mode, coverModeToString(CoverMode::Scale));
- setDefaultValue(Cover_ResizeSize, 500);
+ setDefaultValue(Cover_Size, 500);
 
 // ConfigureDialog **********************
 setDefaultValue(ConfigureDialog_Width, 645);
 setDefaultValue(ConfigureDialog_Height, 425);
 
+ // Resampling ***************************
+ setDefaultValue(Resample_BitsPerSample, 0);
+ setDefaultValue(Resample_SampleRate, 0);
+
+ mPrograms << Resampler::programName();
 
 foreach(OutFormat *format, OutFormat::allFormats())
 {
@@ -177,33 +185,34 @@
 {
 switch (key)
 {
- case Tags_DefaultCodepage: return "Tags/DefaultCodepage";
+ case Tags_DefaultCodepage: return "Tags/DefaultCodepage";
 
 // MainWindow **************************
- case MainWindow_Width: return "MainWindow/Width";
- case MainWindow_Height: return "MainWindow/Height";
+ case MainWindow_Width: return "MainWindow/Width";
+ case MainWindow_Height: return "MainWindow/Height";
 
 // Globals *****************************
- case Encoder_ThreadCount: return "Encoder/ThreadCount";
- case Encoder_TmpDir: return "Encoder/TmpDir";
+ case Encoder_ThreadCount: return "Encoder/ThreadCount";
+ case Encoder_TmpDir: return "Encoder/TmpDir";
 
 // Out Files ***************************
- case OutFiles_Pattern: return "OutFiles/Pattern";
- case OutFiles_Directory: return "OutFiles/Directory";
- case OutFiles_Format: return "OutFiles/Format";
- case OutFiles_PatternHistory: return "OutFiles/PatternHistory";
+ case OutFiles_Pattern: return "OutFiles/Pattern";
+ case OutFiles_Directory: return "OutFiles/Directory";
+ case OutFiles_Format: return "OutFiles/Format";
+ case OutFiles_PatternHistory: return "OutFiles/PatternHistory";
+ case OutFiles_DirectoryHistory: return "OutFiles/DirectoryHistory";
 
 // Internet ****************************
- case Inet_CDDBHost: return "Inet/CDDBHost";
+ case Inet_CDDBHost: return "Inet/CDDBHost";
 
 
 // Misc *********************************
- case Misc_LastDir: return "Misc/LastDirectory";
+ case Misc_LastDir: return "Misc/LastDirectory";
 
 
 // PerTrackCue **************************
- case PerTrackCue_Create: return "PerTrackCue/Create";
- case PerTrackCue_Pregap: return "PerTrackCue/Pregap";
+ case PerTrackCue_Create: return "PerTrackCue/Create";
+ case PerTrackCue_Pregap: return "PerTrackCue/Pregap";
 
 // ConfigureDialog **********************
 case ConfigureDialog_Width: return "ConfigureDialog/Width";
@@ -212,7 +221,11 @@
 
 // Cover image **************************
 case Cover_Mode: return "Cover/Mode";
- case Cover_ResizeSize: return "Cover/Size";
+ case Cover_Size: return "Cover/Size";
+
+ // Resampling ***************************
+ case Resample_BitsPerSample: return "Resample/BitsPerSample";
+ case Resample_SampleRate: return "Resample_SampleRate";
 }
 
 return "";
@@ -443,7 +456,7 @@
 ************************************************/
 int Settings::coverImageSize() const
 {
- return value(Cover_ResizeSize).toInt();
+ return value(Cover_Size).toInt();
 }

flacon-4.1.0.tar.gz/settings.h -> flacon-5.0.0.tar.gz/settings.h Changed

flacon-5.0.0.tar.gz/tags.cpp Added

@@ -0,0 +1,102 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2018
+ * 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 "types.h"
+#include "tags.h"
+
+#include <assert.h>
+#include <QTextCodec>
+#include <QDebug>
+
+
+#define ENC_CODEC "UTF-8"
+
+
+/************************************************
+ *
+ ************************************************/
+static QTextCodec *encCodec()
+{
+ static QTextCodec *res = QTextCodec::codecForName(ENC_CODEC);
+ return res;
+}
+
+
+
+/************************************************
+ *
+ ************************************************/
+TagValue::TagValue(const QString &value):
+ mValue(encCodec()->fromUnicode(value)),
+ mEncoded(true)
+{
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QString TagValue::asString(const QTextCodec *codec) const
+{
+ if (mEncoded)
+ return encCodec()->toUnicode(mValue);
+
+ assert(codec != nullptr);
+ if (codec)
+ return codec->toUnicode(mValue);
+
+ return encCodec()->toUnicode(mValue);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TagValue::setValue(const QByteArray &value)
+{
+ mValue = value;
+ mEncoded = false;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TagValue::setValue(const QString &value)
+{
+ mValue = encCodec()->fromUnicode(value);
+ mEncoded = true;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool TagValue::operator ==(const TagValue &other) const
+{
+ return this->mEncoded == other.mEncoded &&
+ this->mValue == other.mValue;
+}

flacon-5.0.0.tar.gz/tags.h Added

@@ -0,0 +1,95 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2018
+ * 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 TAGS_H
+#define TAGS_H
+
+#include "types.h"
+#include <QByteArray>
+#include <QString>
+#include <QHash>
+#include <QVector>
+
+class QTextCodec;
+
+enum class TagId
+{
+ Album,
+ Catalog,
+ CDTextfile,
+ Comment,
+ Date,
+ Flags,
+ Genre,
+ ISRC,
+ Artist,
+ SongWriter,
+ Title,
+ DiscId,
+ File,
+ DiskNum,
+ DiskCount,
+ CueFile,
+ AlbumArtist,
+ TrackNum,
+ TrackCount,
+};
+
+
+class TagValue
+{
+public:
+ TagValue():
+ mEncoded(false)
+ {
+ }
+
+ TagValue(const QByteArray &val, bool encoded):
+ mValue(val),
+ mEncoded(encoded)
+ {
+ }
+
+ explicit TagValue(const QString &val);
+
+ bool encoded() const { return mEncoded; }
+ QString asString(const QTextCodec *codec) const;
+
+ const QByteArray &value() const { return mValue; }
+ void setValue(const QByteArray &value);
+ void setValue(const QString &value);
+
+ bool operator ==(const TagValue &other) const;
+
+ bool isEmpty() const { return mValue.isEmpty(); }
+
+private:
+ QByteArray mValue;
+ bool mEncoded;
+};
+
+
+#endif // TAGS_H

flacon-4.1.0.tar.gz/tests/CMakeLists.txt -> flacon-5.0.0.tar.gz/tests/CMakeLists.txt Changed

flacon-5.0.0.tar.gz/tests/data/testCueReader Added

flacon-5.0.0.tar.gz/tests/data/testCueReader/00_short.cue Added

flacon-5.0.0.tar.gz/tests/data/testCueReader/00_short.cue.expected Added

@@ -0,0 +1,55 @@
+[DISK 01 / TRACK 01]
+	 FILE       = short.wav
+	 INDEX 00   = 00:00:00
+	 INDEX 01   = 00:00:33
+	 TITLE      = Short track 1
+	 ALBUM      = Short file
+	 PERFORMER  = Test for flacon
+	 DATE       = 2011
+	 DISKID     = 12345678
+	 TRACKNUM   = 1
+	 TRACKCOUNT = 4
+	 DISKNUM    = 1
+	 DISKCOUNT  = 1
+
+[DISK 01 / TRACK 02]
+	 FILE       = short.wav
+	 INDEX 00   = 00:00:00
+	 INDEX 01   = 00:46:00
+	 TITLE      = Short track 2
+	 ALBUM      = Short file
+	 PERFORMER  = Test for flacon
+	 DATE       = 2011
+	 DISKID     = 12345678
+	 TRACKNUM   = 2
+	 TRACKCOUNT = 4
+	 DISKNUM    = 1
+	 DISKCOUNT  = 1
+
+[DISK 01 / TRACK 03]
+	 FILE       = short.wav
+	 INDEX 00   = 01:22:22
+	 INDEX 01   = 01:25:10
+	 TITLE      = Short track 3
+	 ALBUM      = Short file
+	 PERFORMER  = Test for flacon
+	 DATE       = 2011
+	 DISKID     = 12345678
+	 TRACKNUM   = 3
+	 TRACKCOUNT = 4
+	 DISKNUM    = 1
+	 DISKCOUNT  = 1
+
+[DISK 01 / TRACK 04]
+	 FILE       = short.wav
+	 INDEX 00   = 02:39:54
+	 INDEX 01   = 02:41:05
+	 TITLE      = Short track 4
+	 ALBUM      = Short file
+	 PERFORMER  = Test for flacon
+	 DATE       = 2011
+	 DISKID     = 12345678
+	 TRACKNUM   = 4
+	 TRACKCOUNT = 4
+	 DISKNUM    = 1
+	 DISKCOUNT  = 1

flacon-5.0.0.tar.gz/tests/data/testCueReader/01_Meat Loaf - Bat Out Of Hell.cue Added

flacon-5.0.0.tar.gz/tests/data/testCueReader/01_Meat Loaf - Bat Out Of Hell.cue.expected Added

@@ -0,0 +1,102 @@
+[ DISK 01 / TRACK 01]
+	FILE       = Side 1.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 00:00:00
+	TITLE      = 1.1 Bat Out Of Hell
+	ALBUM      = Bat Out Of Hell
+	PERFORMER  = Meat Loaf
+	DATE       = 1977
+	DISKID     = 
+	TRACKNUM   = 1
+	TRACKCOUNT = 7
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+[ DISK 01 / TRACK 02]
+	FILE       = Side 1.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 09:52:00
+	TITLE      = 1.2 You Took The Words Right Out Of My Mouth (Hot Summer Night)
+	ALBUM      = Bat Out Of Hell
+	PERFORMER  = Meat Loaf
+	DATE       = 1977
+	DISKID     = 
+	TRACKNUM   = 2
+	TRACKCOUNT = 7
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 03]
+	FILE       = Side 1.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 14:57:00
+	TITLE      = 1.3 Heaven Can Wait
+	ALBUM      = Bat Out Of Hell
+	PERFORMER  = Meat Loaf
+	DATE       = 1977
+	DISKID     = 
+	TRACKNUM   = 3
+	TRACKCOUNT = 7
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 04]
+	FILE       = Side 1.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 19:39:00
+	TITLE      = 1.4 All Revved Up With No Place To Go
+	ALBUM      = Bat Out Of Hell
+	PERFORMER  = Meat Loaf
+	DATE       = 1977
+	DISKID     = 
+	TRACKNUM   = 4
+	TRACKCOUNT = 7
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 02 / TRACK 01]
+	FILE       = Side 2.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 00:00:00
+	TITLE      = 2.1 Two Out Of Three Ain't Bad
+	ALBUM      = Bat Out Of Hell
+	PERFORMER  = Meat Loaf
+	DATE       = 1977
+	DISKID     = 
+	TRACKNUM   = 5
+	TRACKCOUNT = 7
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 02 / TRACK 02]
+	FILE       = Side 2.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 05:24:00
+	TITLE      = 2.2 Paradise By The Dashboard Light
+	ALBUM      = Bat Out Of Hell
+	PERFORMER  = Meat Loaf
+	DATE       = 1977
+	DISKID     = 
+	TRACKNUM   = 6
+	TRACKCOUNT = 7
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 02 / TRACK 03]
+	FILE       = Side 2.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 13:49:00
+	TITLE      = 2.3 For Crying Out Loud
+	ALBUM      = Bat Out Of Hell
+	PERFORMER  = Meat Loaf
+	DATE       = 1977
+	DISKID     = 
+	TRACKNUM   = 7
+	TRACKCOUNT = 7
+	DISKNUM    = 1
+	DISKCOUNT  = 1

flacon-5.0.0.tar.gz/tests/data/testCueReader/02_dragonattack.cue Added

@@ -0,0 +1,37 @@
+FILE "dragonattack.wav" WAVE
+PERFORMER "Various"
+TITLE "Dragon Attack - A Tribute to Queen"
+  TRACK 01 AUDIO
+    TITLE "McAuley, Impellitteri, Kulick, Roth, Phillips, Schellen / I Want It All"
+    INDEX 00 00:00:00
+    INDEX 01 00:00:30
+  TRACK 02 AUDIO
+    TITLE "LaBrie, Friedman, Franklin, Appice / Sheer Heart Attack"
+    INDEX 01 04:08:02
+  TRACK 03 AUDIO
+    TITLE "Adam, Petrucci, Sarzo, Aldridge / Another One Bites the Dust"
+    INDEX 01 07:35:59
+  TRACK 04 AUDIO
+    TITLE "Sato, Kulick, Kulick, Sherwood, Phillips, Singer / Save Me"
+    INDEX 01 11:01:62
+  TRACK 05 AUDIO
+    TITLE "Shortino, Kulick, Schellen, Laurent, Dio / We Will Rock You"
+    INDEX 01 15:13:54
+  TRACK 06 AUDIO
+    TITLE "Shortino, Krieger, Kulick, Sherwood, Franklin, Appice, Laurent, Dio / We are the Champions"
+    INDEX 01 17:16:21
+  TRACK 07 AUDIO
+    TITLE "Kilmister, Nugent, Kilmister, Kulick, Sarzo, Aldridge / Tie Your Mother Down"
+    INDEX 01 20:57:08
+  TRACK 08 AUDIO
+    TITLE "Hughes, Lee, Kulick, Franklin, Appice / Get Down Make Love"
+    INDEX 01 24:43:15
+  TRACK 09 AUDIO
+    TITLE "Boals, Malmsteen, Sarza, Aldridge / Keep Yourself Alive"
+    INDEX 01 28:53:69
+  TRACK 10 AUDIO
+    TITLE "LaBrie, Bouillet, Bouillet, Kulick, Phillips, Schellen / One Vision"
+    INDEX 01 32:42:60
+  TRACK 11 AUDIO
+    TITLE "Bush, Ian, Throne, Vera, Ian / It's Late"
+    INDEX 01 36:27:64

flacon-5.0.0.tar.gz/tests/data/testCueReader/02_dragonattack.cue.expected Added

@@ -0,0 +1,163 @@
+[ DISK 01 / TRACK 01 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 00:00:30
+	TITLE      = I Want It All
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = McAuley, Impellitteri, Kulick, Roth, Phillips, Schellen
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 1
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 02 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 04:08:02
+	TITLE      = Sheer Heart Attack
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = LaBrie, Friedman, Franklin, Appice
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 2
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 03 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 07:35:59
+	TITLE      = Another One Bites the Dust
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = Adam, Petrucci, Sarzo, Aldridge
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 3
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 04 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 11:01:62
+	TITLE      = Save Me
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = Sato, Kulick, Kulick, Sherwood, Phillips, Singer
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 4
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 05 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 15:13:54
+	TITLE      = We Will Rock You
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = Shortino, Kulick, Schellen, Laurent, Dio
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 5
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 06 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 17:16:21
+	TITLE      = We are the Champions
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = Shortino, Krieger, Kulick, Sherwood, Franklin, Appice, Laurent, Dio
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 6
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 07 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 20:57:08
+	TITLE      = Tie Your Mother Down
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = Kilmister, Nugent, Kilmister, Kulick, Sarzo, Aldridge
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 7
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 08 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 24:43:15
+	TITLE      = Get Down Make Love
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = Hughes, Lee, Kulick, Franklin, Appice
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 8
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 09 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 28:53:69
+	TITLE      = Keep Yourself Alive
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = Boals, Malmsteen, Sarza, Aldridge
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 9
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 10 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 32:42:60
+	TITLE      = One Vision
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = LaBrie, Bouillet, Bouillet, Kulick, Phillips, Schellen
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 10
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 11 ]
+	FILE       = dragonattack.wav
+	INDEX 00   = 00:00:00
+	INDEX 01   = 36:27:64
+	TITLE      = It's Late
+	ALBUM      = Dragon Attack - A Tribute to Queen
+	PERFORMER  = Bush, Ian, Throne, Vera, Ian
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 11
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1

flacon-5.0.0.tar.gz/tests/data/testCueReader/03_stonecold.cue Added

@@ -0,0 +1,36 @@
+FILE "stonecold.flac" FLAC
+PERFORMER "Various"
+TITLE "Tribute To Queen - Stone Cold Queen"
+  TRACK 01 AUDIO
+    TITLE "Robin Zander - Stone Cold Crazy"
+    INDEX 01 00:00:00
+  TRACK 02 AUDIO
+    TITLE "Mickey Thomas - Play The Game"
+    INDEX 01 03:38:30
+  TRACK 03 AUDIO
+    TITLE "Joe Lynn Turner - Fat Bottomed Girls"
+    INDEX 01 08:35:35
+  TRACK 04 AUDIO
+    TITLE "Geoff Tate - Somebody To Love"
+    INDEX 01 13:02:10
+  TRACK 05 AUDIO
+    TITLE "Gunnar & Mathew Nelson - Crazy Little Thing Called Love"
+    INDEX 01 17:47:17
+  TRACK 06 AUDIO
+    TITLE "Jack Blades - Fight From Inside"
+    INDEX 01 20:55:62
+  TRACK 07 AUDIO
+    TITLE "Jason Scheff - You're My Best Friend"
+    INDEX 01 24:48:12
+  TRACK 08 AUDIO
+    TITLE "Kip Winger - I'm In Love With My Car"
+    INDEX 01 27:57:45
+  TRACK 09 AUDIO
+    TITLE "Glenn Hughes - Killer Queen"
+    INDEX 01 31:42:05
+  TRACK 10 AUDIO
+    TITLE "Tommy Shaw - Spread Your Wings"
+    INDEX 01 35:12:15
+  TRACK 11 AUDIO
+    TITLE "Jack Russel - We Will Rock You"
+    INDEX 01 39:58:10

flacon-5.0.0.tar.gz/tests/data/testCueReader/03_stonecold.cue.expected Added

@@ -0,0 +1,163 @@
+[ DISK 01 / TRACK 01 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 00:00:00
+	TITLE      = Stone Cold Crazy
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Robin Zander
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 1
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 02 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 03:38:30
+	TITLE      = Play The Game
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Mickey Thomas
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 2
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 03 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 08:35:35
+	TITLE      = Fat Bottomed Girls
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Joe Lynn Turner
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 3
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 04 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 13:02:10
+	TITLE      = Somebody To Love
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Geoff Tate
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 4
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 05 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 17:47:17
+	TITLE      = Crazy Little Thing Called Love
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Gunnar & Mathew Nelson
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 5
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 06 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 20:55:62
+	TITLE      = Fight From Inside
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Jack Blades
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 6
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 07 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 24:48:12
+	TITLE      = You're My Best Friend
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Jason Scheff
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 7
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 08 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 27:57:45
+	TITLE      = I'm In Love With My Car
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Kip Winger
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 8
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 09 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 31:42:05
+	TITLE      = Killer Queen
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Glenn Hughes
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 9
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 10 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 35:12:15
+	TITLE      = Spread Your Wings
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Tommy Shaw
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 10
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1
+
+
+[ DISK 01 / TRACK 11 ]
+	FILE       = stonecold.flac
+	INDEX 00   = 00:00:00
+	INDEX 01   = 39:58:10
+	TITLE      = We Will Rock You
+	ALBUM      = Tribute To Queen - Stone Cold Queen
+	PERFORMER  = Jack Russel
+	DATE       = 
+	DISKID     = 
+	TRACKNUM   = 11
+	TRACKCOUNT = 11
+	DISKNUM    = 1
+	DISKCOUNT  = 1

flacon-5.0.0.tar.gz/tests/data/testCueReader/04_issue_75.cue Added

flacon-5.0.0.tar.gz/tests/data/testCueReader/04_issue_75.cue.expected Added

flacon-5.0.0.tar.gz/tests/data/testCueReader/05_issue_77.cue Added

flacon-5.0.0.tar.gz/tests/data/testCueReader/05_issue_77.cue.expected Added

flacon-4.1.0.tar.gz/tests/inittestcase.cpp -> flacon-5.0.0.tar.gz/tests/inittestcase.cpp Changed

@@ -34,12 +34,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-#include <QFuture>
-#include <QtConcurrentRun>
-#else
 #include <QtConcurrent/QtConcurrent>
-#endif
 
 #ifdef Q_OS_WIN
 #define PATH_ENV_SEPARATOR ';'
@@ -78,6 +73,7 @@
 ************************************************/
 void TestFlacon::initTestCase()
 {
+ initTypes();
 Settings::setFileName(TEST_OUT_DIR "/flacon.conf");
 
 if (findProgram("mac").isEmpty()) QFAIL("mac program not found");
@@ -138,10 +134,10 @@
 }
 
 
-QString TestFlacon::dir()
+QString TestFlacon::dir(const QString &subTest)
 {
 QString test = QString::fromLocal8Bit(QTest::currentTestFunction());
- QString subtest = QString::fromLocal8Bit(QTest::currentDataTag());
+ QString subtest = subTest.isEmpty() ? QString::fromLocal8Bit(QTest::currentDataTag()) : subTest;
 
 
 return QDir::cleanPath(QString("%1/%2/%3")
@@ -152,34 +148,6 @@
 }
 
 
-
-#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;
@@ -191,11 +159,7 @@
 
 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__);

flacon-4.1.0.tar.gz/tests/test_convert.cpp -> flacon-5.0.0.tar.gz/tests/test_convert.cpp Changed

@@ -33,6 +33,7 @@
 #include "project.h"
 #include "../inputaudiofile.h"
 #include "../converter/converter.h"
+#include "tags.h"
 
 #include <QDir>
 #include <QDebug>
@@ -68,6 +69,33 @@
 qWarning() << "Converter error:" << msg;
 }
 
+
+/************************************************
+ *
+ ************************************************/
+TagId tagNameToId(const QString &tagName)
+{
+ if (tagName.toUpper() == "ALBUM") return TagId::Album;
+ if (tagName.toUpper() == "CATALOG") return TagId::Catalog;
+ if (tagName.toUpper() == "CDTEXTFILE") return TagId::CDTextfile;
+ if (tagName.toUpper() == "COMMENT") return TagId::Comment;
+ if (tagName.toUpper() == "DATE") return TagId::Date;
+ if (tagName.toUpper() == "FLAGS") return TagId::Flags;
+ if (tagName.toUpper() == "GENRE") return TagId::Genre;
+ if (tagName.toUpper() == "ISRC") return TagId::ISRC;
+ if (tagName.toUpper() == "PERFORMER") return TagId::Artist;
+ if (tagName.toUpper() == "SONGWRITER") return TagId::SongWriter;
+ if (tagName.toUpper() == "TITLE") return TagId::Title;
+ if (tagName.toUpper() == "DISCId") return TagId::DiscId;
+ if (tagName.toUpper() == "FILE") return TagId::File;
+ if (tagName.toUpper() == "DISKNUM") return TagId::DiskNum;
+ if (tagName.toUpper() == "DISCOUNT") return TagId::DiskCount;
+ if (tagName.toUpper() == "CUEFILE") return TagId::CueFile;
+
+ FAIL("Unknown TAG: \"" + tagName +"\"");
+ return TagId(0);
+}
+
 /************************************************
 *
 ************************************************/
@@ -85,7 +113,6 @@
 settings->setOutFileDir(dir());
 settings->setOutFilePattern("%a/%n - %t");
 
- Project::installErrorHandler(consoleErroHandler);
 project->clear();
 foreach (TestConvertRequest req, requests)
 {
@@ -119,7 +146,8 @@
 
 foreach (QString s, line.section(' ', 1).split(','))
 {
- track->setTag(s.section(':', 0, 0).trimmed(), s.section(':', 1).trimmed());
+ TagId tagId = tagNameToId(s.section(':', 0, 0).trimmed());
+ track->setTag(tagId, s.section(':', 1).trimmed());
 }
 }
 }

flacon-5.0.0.tar.gz/tests/test_cuereader.cpp Added

@@ -0,0 +1,164 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2018
+ * 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 <QTest>
+#include "../cue.h"
+#include "tools.h"
+#include <QDebug>
+#include <QDir>
+#include <QSettings>
+
+
+/************************************************
+ *
+ ************************************************/
+QFile &operator<<(QFile &file, const QString &value)
+{
+ file.write(value.toLocal8Bit());
+ return file;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QFile &operator<<(QFile &file, const int &value)
+{
+ return file << QString("%1").arg(value);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+static void write(const QVector<CueDisk> &cue, const QString &fileName)
+{
+ QFile f(fileName);
+ f.open(QFile::WriteOnly | QFile::Truncate);
+
+ for (int d=0; d<cue.count(); ++d)
+ {
+ auto disk = cue.at(d);
+
+ int t = -1;
+ foreach (const Track &track, disk)
+ {
+ t++;
+ f << QString("[DISK %1 / TRACK %2]\n").arg(d+1, 2, 10, QChar('0')).arg(t+1, 2, 10, QChar('0'));
+
+ f << "\t" << "FILE = " << track.tag(TagId::File) << "\n";
+ f << "\t" << "INDEX 00 = " << track.cueIndex(0).toString(true) << "\n";
+ f << "\t" << "INDEX 01 = " << track.cueIndex(1).toString(true) << "\n";
+ f << "\t" << "TITLE = " << track.tag(TagId::Title) << "\n";
+ f << "\t" << "ALBUM = " << track.tag(TagId::Album) << "\n";
+ f << "\t" << "PERFORMER = " << track.tag(TagId::Artist) << "\n";
+ f << "\t" << "DATE = " << track.tag(TagId::Date) << "\n";
+ f << "\t" << "DISKID = " << track.tag(TagId::DiscId) << "\n";
+ f << "\t" << "GENRE = " << track.tag(TagId::Genre) << "\n";
+ f << "\t" << "TRACKNUM = " << QString::number(track.trackNum()) << "\n";
+ f << "\t" << "TRACKCOUNT = " << QString::number(track.trackCount()) << "\n";
+ f << "\t" << "DISKNUM = " << QString::number(track.diskNum()) << "\n";
+ f << "\t" << "DISKCOUNT = " << QString::number(track.diskCount()) << "\n";
+
+
+ f << "\n";
+ }
+ }
+
+ f.close();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+static void compare(const QString &resFile, const QString &expectedFile)
+{
+ QSettings result(resFile, QSettings::IniFormat);
+ QSettings expected(expectedFile, QSettings::IniFormat);
+
+ foreach (auto key, expected.allKeys())
+ {
+ if (result.value(key).toString() == expected.value(key).toString())
+ continue;
+
+ QString msg = QString("Compared values are not the same\n\tKey\t%1\n\tActual\t%2\n\tExpected\t%3")
+ .arg(key)
+ .arg(result.value(key).toString())
+ .arg(expected.value(key).toString());
+
+ QFAIL(msg.toLocal8Bit());
+ }
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testCueReader()
+{
+ QFETCH(QString, cue);
+
+ QString srcDir = mDataDir + "testCueReader";
+
+ QString cueFile = dir() + "/" + cue;
+ QString expectedFile = cueFile + ".expected";
+ QString resultFile = cueFile + ".result";
+
+ QFile::copy(srcDir + "/" + cue, cueFile);
+ QFile::copy(srcDir + "/" + cue + ".expected", expectedFile);
+
+ try
+ {
+ CueReader reader;
+ auto cue = reader.load(cueFile);
+ write(cue, resultFile);
+
+ compare(resultFile, expectedFile);
+ }
+ catch (FlaconError &err)
+ {
+ FAIL(err.message());
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testCueReader_data()
+{
+ QTest::addColumn<QString>("cue");
+ QString srcDir = mDataDir + "testCueReader";
+
+ foreach(QString f, QDir(srcDir).entryList(QStringList("*.cue"), QDir::Files, QDir::Name))
+ {
+ QTest::newRow(f.toLocal8Bit()) << f;
+
+ }
+}

flacon-4.1.0.tar.gz/tests/test_decoder.cpp -> flacon-5.0.0.tar.gz/tests/test_decoder.cpp Changed

flacon-4.1.0.tar.gz/tests/test_findaudiofile.cpp -> flacon-5.0.0.tar.gz/tests/test_findaudiofile.cpp Changed

flacon-4.1.0.tar.gz/tests/test_outformatencoderargs.cpp -> flacon-5.0.0.tar.gz/tests/test_outformatencoderargs.cpp Changed

@@ -93,8 +93,11 @@
 << cfg
 << "/opt/flac --force --silent "
 "--compression-level-5 "
- "--tag artist=Artist --tag album=Album --tag genre=Genre --tag date=2013 --tag title=Song01 --tag comment=ExactAudioCopy v0.99pb4 "
- "--tag discId=123456789 --tag TRACKNUMBER=1 --tag TOTALTRACKS=4 --tag TRACKTOTAL=4 - -o OutFile.wav";
+ "--tag artist=Artist --tag album=Album --tag genre=Genre --tag date=2013 --tag title=Song01 --tag albumartist=Artist "
+ "--tag comment=ExactAudioCopy v0.99pb4 --tag discId=123456789 "
+ "--tag tracknumber=1 --tag totaltracks=4 --tag tracktotal=4 "
+ "--tag disc=1 --tag discnumber=1 --tag disctotal=1 "
+ "- -o OutFile.wav";
 
 //*******************************************
 cfg.clear();
@@ -107,8 +110,11 @@
 << cfg
 << "/opt/flac --force --silent "
 "--compression-level-1 "
- "--tag artist=Artist --tag album=Album --tag genre=Genre --tag date=2013 --tag title=Song01 --tag comment=ExactAudioCopy v0.99pb4 "
- "--tag discId=123456789 --tag TRACKNUMBER=1 --tag TOTALTRACKS=4 --tag TRACKTOTAL=4 - -o OutFile.wav";
+ "--tag artist=Artist --tag album=Album --tag genre=Genre --tag date=2013 --tag title=Song01 --tag albumartist=Artist "
+ "--tag comment=ExactAudioCopy v0.99pb4 --tag discId=123456789 "
+ "--tag tracknumber=1 --tag totaltracks=4 --tag tracktotal=4 "
+ "--tag disc=1 --tag discnumber=1 --tag disctotal=1 "
+ "- -o OutFile.wav";
 
 
 //*******************************************
@@ -119,12 +125,13 @@
 cfg.insert("Aac/UseQuality", true);
 cfg.insert("Aac/Quality", 500);
 
- QTest::newRow("AAC_1")
+ QTest::newRow("01 AAC_1")
 << "AAC"
 << cfg
 << "/opt/faac -w "
 "-q 500 "
- "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --year 2013 --comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
+ "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --disc 1/1 --year 2013 "
+ "--comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
 
 
 //*******************************************
@@ -133,12 +140,13 @@
 cfg.insert("Aac/UseQuality", true);
 cfg.insert("Aac/Quality", 10);
 
- QTest::newRow("AAC_2")
+ QTest::newRow("02 AAC_2")
 << "AAC"
 << cfg
 << "/opt/faac -w "
 "-q 10 "
- "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --year 2013 --comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
+ "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --disc 1/1 --year 2013 "
+ "--comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
 
 //*******************************************
 cfg.clear();
@@ -147,12 +155,13 @@
 cfg.insert("Aac/Quality", 500);
 cfg.insert("Aac/Bitrate", 64);
 
- QTest::newRow("AAC_3")
+ QTest::newRow("03 AAC_3")
 << "AAC"
 << cfg
 << "/opt/faac -w "
 "-b 64 "
- "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --year 2013 --comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
+ "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --disc 1/1 --year 2013 "
+ "--comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
 
 
 //*******************************************
@@ -163,147 +172,173 @@
 cfg.insert("Mp3/Preset", "vbrMedium");
 cfg.insert("Aac/Quality", 500);
 
- QTest::newRow("MP3_vbrMedium")
+ QTest::newRow("01 MP3_vbrMedium")
 << "MP3"
 << cfg
 << "/opt/lame --silent "
 "--preset medium "
- "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+ "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tv TPE2=Artist "
+ "--tc ExactAudioCopy v0.99pb4 --tn 1/4 --tv TPOS=1 "
+ "- OutFile.wav";
 
 
 //*******************************************
 cfg.insert("Mp3/Preset", "vbrStandard");
 
- QTest::newRow("MP3_vbrStandard")
+ QTest::newRow("02 MP3_vbrStandard")
 << "MP3"
 << cfg
 << "/opt/lame "
 "--silent "
 "--preset standard "
- "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+ "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tv TPE2=Artist "
+ "--tc ExactAudioCopy v0.99pb4 --tn 1/4 --tv TPOS=1 "
+ "- OutFile.wav";
 
 
 
 //*******************************************
 cfg.insert("Mp3/Preset", "vbrStandardFast");
 
- QTest::newRow("MP3_vbrStandardFast")
+ QTest::newRow("04 MP3_vbrStandardFast")
 << "MP3"
 << cfg
 << "/opt/lame --silent "
 "--preset fast standard "
- "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+ "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tv TPE2=Artist "
+ "--tc ExactAudioCopy v0.99pb4 --tn 1/4 --tv TPOS=1 "
+ "- OutFile.wav";
 
 
 //*******************************************
 cfg.insert("Mp3/Preset", "vbrExtreme");
 
- QTest::newRow("MP3_vbrExtreme")
+ QTest::newRow("05 MP3_vbrExtreme")
 << "MP3"
 << cfg
 << "/opt/lame --silent "
 "--preset extreme "
- "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+ "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tv TPE2=Artist "
+ "--tc ExactAudioCopy v0.99pb4 --tn 1/4 --tv TPOS=1 "
+ "- OutFile.wav";
 
 //*******************************************
 cfg.insert("Mp3/Preset", "vbrExtremeFast");
 
- QTest::newRow("MP3_vbrExtremeFast")
+ QTest::newRow("06 MP3_vbrExtremeFast")
 << "MP3"
 << cfg
 << "/opt/lame --silent "
 "--preset fast extreme "
- "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+ "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tv TPE2=Artist "
+ "--tc ExactAudioCopy v0.99pb4 --tn 1/4 --tv TPOS=1 "
+ "- OutFile.wav";
 
 
 //*******************************************
 cfg.insert("Mp3/Preset", "cbrInsane");
 
- QTest::newRow("MP3_cbrInsane")
+ QTest::newRow("07 MP3_cbrInsane")
 << "MP3"
 << cfg
 << "/opt/lame --silent "
 "--preset insane "
- "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+ "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tv TPE2=Artist "
+ "--tc ExactAudioCopy v0.99pb4 --tn 1/4 --tv TPOS=1 "
+ "- OutFile.wav";
 
 //*******************************************
 cfg.insert("Mp3/Preset", "cbrKbps");
 cfg.insert("Mp3/Bitrate", 64);
 
- QTest::newRow("MP3_cbrKbps64")
+ QTest::newRow("08 MP3_cbrKbps64")
 << "MP3"
 << cfg
 << "/opt/lame --silent "
 "--preset cbr 64 "
- "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+ "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tv TPE2=Artist "
+ "--tc ExactAudioCopy v0.99pb4 --tn 1/4 --tv TPOS=1 "
+ "- OutFile.wav";
 
 //*******************************************
 cfg.insert("Mp3/Preset", "cbrKbps");
 cfg.insert("Mp3/Bitrate", 128);
 
- QTest::newRow("MP3_cbrKbps128")
+ QTest::newRow("09 MP3_cbrKbps128")
 << "MP3"
 << cfg
 << "/opt/lame --silent "
 "--preset cbr 128 "
- "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+ "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tv TPE2=Artist "
+ "--tc ExactAudioCopy v0.99pb4 --tn 1/4 --tv TPOS=1 "
+ "- OutFile.wav";
 
 
 //*******************************************
 cfg.insert("Mp3/Preset", "abrKbps");

flacon-4.1.0.tar.gz/tests/testflacon.cpp -> flacon-5.0.0.tar.gz/tests/testflacon.cpp Changed

@@ -27,14 +27,6 @@
 #include <QTest>
 #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 <QDebug>
 #include <QProcess>
@@ -43,7 +35,16 @@
 #include <QDir>
 #include <QThreadPool>
 
-#define protected public;
+#define protected public
+#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 "converter/diskpipline.h"
 
 
 int TestFlacon::mTestNum = -1;
@@ -216,22 +217,39 @@
 }
 
 
+void removeEmptyLines(QByteArray &data)
+{
+ data = data.trimmed();
+ while (true)
+ {
+ int n = data.length();
+ data.replace("\n\n", "\n");
+ if (n == data.length())
+ break;
+ }
+}
+
 /************************************************
 
 ************************************************/
-bool TestFlacon::compareCue(const QString &result, const QString &expected, QString *error)
+bool TestFlacon::compareCue(const QString &result, const QString &expected, QString *error, bool skipEmptyLines)
 {
 QFile resFile(result);
 resFile.open(QFile::ReadOnly);
 QByteArray resData = resFile.readAll();
 resFile.close();
 resData.replace("\r\n", "\n");
+ if (skipEmptyLines)
+ removeEmptyLines(resData);
+
 
 QFile expFile(expected);
 expFile.open(QFile::ReadOnly);
 QByteArray expData = expFile.readAll();
 expFile.close();
 expData.replace("\r\n", "\n");
+ if (skipEmptyLines)
+ removeEmptyLines(expData);
 
 if (resData != expData)
 {
@@ -660,30 +678,27 @@
 QFETCH(QString, outDir);
 QFETCH(QString, pattern);
 QFETCH(QString, expected);
- QFETCH(QString, audioFile);
+ QFETCH(QString, cueFile);
 
 settings->setOutFileDir(outDir);
 settings->setOutFilePattern(pattern);
 settings->setOutFormat("WAV");
 
- Disk *disk = loadFromCue(mDataDir + "simple.cue");
 
- if (!audioFile.isEmpty())
- {
- InputAudioFile audio(audioFile);
- if (!audio.isValid())
- QFAIL(audio.errorString().toLocal8Bit().data());
+ if (!cueFile.isEmpty())
+ QFile::copy(mDataDir + "simple.cue", cueFile);
+ else
+ cueFile = mDataDir + "simple.cue";
 
- disk->setAudioFile(audio);
- }
+ Disk *disk = loadFromCue(cueFile);
 
 QString result = disk->track(0)->resultFilePath();
 if (QFileInfo(result).absoluteFilePath() != QFileInfo(expected).absoluteFilePath())
 {
- QString msg = QString("Compared values are not the same\n Actual: %1 [%2]\n Expected: %3\n AudioFile: %4").arg(
+ QString msg = QString("Compared values are not the same\n Actual: %1 [%2]\n Expected: %3\n CueFile: %4").arg(
 QFileInfo(result).absoluteFilePath(), result,
 expected,
- audioFile);
+ cueFile);
 QFAIL(msg.toLocal8Bit());
 }
 //QCOMPARE(result, expected);
@@ -700,7 +715,7 @@
 QTest::addColumn<QString>("outDir");
 QTest::addColumn<QString>("pattern");
 QTest::addColumn<QString>("expected");
- QTest::addColumn<QString>("audioFile");
+ QTest::addColumn<QString>("cueFile");
 
 
 QTest::newRow("1: /home/user/music")
@@ -727,21 +742,23 @@
 QTest::newRow("4: empty")
 << ""
 << "%a/%y - %A/%n - %t"
- << QDir::homePath() + "/Artist/2013 - Album/01 - Song01.wav"
+ << mDataDir + "/Artist/2013 - Album/01 - Song01.wav"
 << "";
 
 
 QTest::newRow("5: dot (.) with CdAudioFile")
 << "."
 << "%a/%y - %A/%n - %t"
- << mTmpDir + "/Artist/2013 - Album/01 - Song01.wav"
- << mAudio_cd_wav;
+ << dir("5: dot (.) with CdAudioFile") + "/Artist/2013 - Album/01 - Song01.wav"
+ << dir("5: dot (.) with CdAudioFile") + "/simple.cue";
+
 
 QTest::newRow("6. empty with CdAudioFile")
 << ""
 << "%a/%y - %A/%n - %t"
- << mTmpDir + "/Artist/2013 - Album/01 - Song01.wav"
- << mAudio_cd_wav;
+ << dir("6. empty with CdAudioFile") + "/Artist/2013 - Album/01 - Song01.wav"
+ << dir("6. empty with CdAudioFile") + "/simple.cue";
+
 
 QTest::newRow("7: ~")
 << "~"
@@ -782,7 +799,7 @@
 Disk *disk = loadFromCue(testCueFile);
 
 if (!codepageAfter.isEmpty())
- disk->setTextCodecName(codepageAfter);
+ disk->setCodecName(codepageAfter);
 
 QStringList expected = this->readFile(TEST_DATA_DIR + sampleFile);
 
@@ -796,13 +813,13 @@
 {
 Track *track = disk->track(i);
 result << "Track " << (i + 1) << "\n";
- result << " " << "INDEX:" << track->index() << "\n";
- result << " " << "TRACKNUM:" << track->trackNum() << "\n";
- result << " " << "ALBUM:" << track->album() << "\n";
- result << " " << "TITLE:" << track->title() << "\n";
- result << " " << "ARTIST:" << track->artist() << "\n";
- result << " " << "GENRE:" << track->genre() << "\n";
- result << " " << "YEAR:" << track->date() << "\n";
+ result << " " << "INDEX:" <trackNum() << "\n";
+ result << " " << "ALBUM:" << track->album() << "\n";
+ result << " " << "TITLE:" << track->title() << "\n";
+ result << " " << "ARTIST:" << track->artist() << "\n";
+ result << " " << "GENRE:" << track->genre() << "\n";
+ result << " " << "YEAR:" << track->date() << "\n";
 }
 
 // Result *************************
@@ -835,13 +852,13 @@
 QTest::addColumn<QString>("codepageAfter");
 
 
- QTest::newRow("TrackSet_UTF-8")
+ QTest::newRow("01 TrackSet_UTF-8")
 << "ru_utf8.cue" << "ru.result" << "Big5" << "UTF-8";
 
- QTest::newRow("TrackSet_UTF-8_BOM")
+ QTest::newRow("02 TrackSet_UTF-8_BOM")
 << "ru_utf8_BOM.cue"<< "ru.result" << "Big5" << "";
 
- QTest::newRow("TrackSet_CP1251")
+ QTest::newRow("03 TrackSet_CP1251")
 << "ru_cp1251.cue" << "ru.result" << "UTF-8" << "Windows-1251";
 }
 
@@ -1061,4 +1078,83 @@
 }

flacon-4.1.0.tar.gz/tests/testflacon.h -> flacon-5.0.0.tar.gz/tests/testflacon.h Changed

flacon-4.1.0.tar.gz/tests/tools.cpp -> flacon-5.0.0.tar.gz/tests/tools.cpp Changed

flacon-4.1.0.tar.gz/tests/tools.h -> flacon-5.0.0.tar.gz/tests/tools.h Changed

flacon-4.1.0.tar.gz/track.cpp -> flacon-5.0.0.tar.gz/track.cpp Changed

@@ -26,30 +26,70 @@
 
 #include "track.h"
 
+#include <assert.h>
+
 #include "disk.h"
 #include "inputaudiofile.h"
 #include "project.h"
 #include "settings.h"
 #include "outformat.h"
 
+#include <uchardet.h>
 #include <QDir>
+#include <QTextCodec>
 #include <QDebug>
 
+
+/************************************************
+
+ ************************************************/
+Track::Track():
+ QObject(nullptr),
+ mTextCodec(nullptr),
+ mDuration(0)
+{
+}
+
+
 /************************************************
+ *
+ ************************************************/
+Track::Track(const Track &other):
+ QObject(nullptr),
+ mTags(other.mTags),
+ mTextCodec(other.mTextCodec),
+ mCueIndexes(other.mCueIndexes),
+ mDuration(other.mDuration),
+ mCueFileName(other.mCueFileName)
+{
+}
+
+
+/************************************************
+ *
+ ************************************************/
+Track &Track::operator =(const Track &other)
+{
+ setTags(other);
+ mCueIndexes = other.mCueIndexes;
+ mDuration = other.mDuration;
+ mCueFileName= other.mCueFileName;
+
+ return *this;
+}
+
 
+/************************************************
+ *
 ************************************************/
-Track::Track(Disk *disk, int index):
- QObject(disk),
- mDisk(disk),
- mIndex(index),
- mCueIndexes(100),
- mStatus(NotRunning),
- mProgress(0)
+void Track::setTags(const Track &other)
 {
- qRegisterMetaType<Track::Status>("Track::Status");
+ mTags = other.mTags;
+ mTextCodec = other.mTextCodec;
 }
 
 
+
 /************************************************
 
 ************************************************/
@@ -61,52 +101,81 @@
 /************************************************
 *
 ************************************************/
-uint Track::duration() const
+QString Track::tag(const TagId &tagId) const
 {
- uint start = cueIndex(1).milliseconds();
- uint end = 0;
- if (index() < mDisk->count() - 1)
- {
- end = mDisk->track(index()+1)->cueIndex(1).milliseconds();
- }
- else if (mDisk->audioFile())
- {
- end = mDisk->audioFile()->duration();
- }
+ return mTags.value(static_cast<int>(tagId)).asString(mTextCodec);
+}
 
- if (start > end)
- return 0;
 
- return end - start;
+/************************************************
+ *
+ ************************************************/
+QByteArray Track::tagData(const TagId &tagId) const
+{
+ return mTags.value(static_cast<int>(tagId)).value();
 }
 
 
 /************************************************
+ *
+ ************************************************/
+TagValue Track::tagValue(TagId tagId) const
+{
+ return mTags.value(static_cast<int>(tagId));
+}
+
 
+/************************************************
+ *
 ************************************************/
-QString Track::tag(const QString &tagName) const
+void Track::setTag(const TagId &tagId, const QString &value)
 {
- return mDisk->getTag(mIndex, tagName);
+ mTags.insert(static_cast<int>(tagId), TagValue(value));
+ emit tagChanged(tagId);
 }
 
 
 /************************************************
+ *
+ ************************************************/
+void Track::setTag(const TagId &tagId, const QByteArray &value)
+{
+ mTags.insert(static_cast<int>(tagId), TagValue(value, false));
+ emit tagChanged(tagId);
+}
 
+
+/************************************************
+ *
 ************************************************/
-void Track::setTag(const QString &tagName, const QString &value)
+void Track::setTag(TagId tagId, const TagValue &value)
 {
- mDisk->setTag(mIndex, tagName, value);
+ mTags.insert(static_cast<int>(tagId), value);
+ emit tagChanged(tagId);
 }
 
 
 /************************************************
+ *
+ ************************************************/
+QString Track::codecName() const
+{
+ if (mTextCodec)
+ return mTextCodec->name();
 
+ return "";
+}
+
+
+/************************************************
+ *
 ************************************************/
-void Track::setProgress(Track::Status status, int percent)
+void Track::setCodecName(const QString &value)
 {
- mStatus = status;
- mProgress = percent;
- project->emitTrackProgress(this);
+ if (!value.isEmpty())
+ mTextCodec = QTextCodec::codecForName(value.toLatin1());
+ else
+ mTextCodec = nullptr;
 }
 
 
@@ -119,15 +188,48 @@
 if (pattern.isEmpty())
 pattern = QString("%a/%y - %A/%n - %t");
 
- return calcFileName(pattern,
- disk()->count(),
- trackNum(),
+ int n = pattern.lastIndexOf(QDir::separator());
+ if (n < 0)
+ {
+ return calcFileName(pattern,
+ this->trackCount(),
+ this->trackNum(),
+ this->album(),
+ this->title(),
+ this->artist(),
+ this->genre(),

flacon-4.1.0.tar.gz/track.h -> flacon-5.0.0.tar.gz/track.h Changed

@@ -28,70 +28,78 @@
 #define TRACK_H
 
 #include <QObject>
-#include "cue.h"
+#include "types.h"
+#include "tags.h"
 
 class Disk;
 
 class Track: public QObject
 {
 Q_OBJECT
+ friend class Disk;
+ friend class CueReader;
 public:
-
- enum Status
- {
- NotRunning = 0,
- Canceled = 1,
- Error = 2,
- Aborted = 3,
- OK = 4,
- Splitting = 5,
- Encoding = 6,
- Queued = 7,
- WaitGain = 8,
- CalcGain = 9,
- WriteGain = 10
- };
-
- explicit Track(Disk *disk, int index);
+ Track();
+ Track(const Track &other);
+ Track &operator =(const Track &other);
+ void setTags(const Track &other);
 ~Track();
 
- QString artist() const { return tag("PERFORMER"); }
- void setArtist(const QString &value) { setTag("PERFORMER", value); }
+ QString tag(const TagId &tagId) const;
+ QByteArray tagData(const TagId &tagId) const;
+ TagValue tagValue(TagId tagId) const;
+ void setTag(const TagId &tagId, const QString &value);
+ void setTag(const TagId &tagId, const QByteArray &value);
+ void setTag(TagId tagId, const TagValue &value);
+
+
+ QString codecName() const;
+ void setCodecName(const QString &value);
+ const QTextCodec *codec() const { return mTextCodec; }
+
+ bool operator ==(const Track &other) const;
+
+
+ QString artist() const { return tag(TagId::Artist); }
+ void setArtist(const QString &value) { setTag(TagId::Artist, value); }
+
+ QString album() const { return tag(TagId::Album); }
+ void setAlbum(const QString &value) { setTag(TagId::Album, value); }
 
- QString album() const { return tag("ALBUM"); }
- void setAlbum(const QString &value) { setTag("ALBUM", value); }
+ QString comment() const { return tag(TagId::Comment) ;}
+ void setComment(const QString &value) { setTag(TagId::Comment, value); }
 
- QString comment() const { return tag("COMMENT") ;}
- void setComment(const QString &value) { setTag("COMMENT", value); }
+ QString title() const { return tag(TagId::Title) ;}
+ void setTitle(const QString &value) { setTag(TagId::Title, value); }
 
- QString title() const { return tag("TITLE") ;}
- void setTitle(const QString &value) { setTag("TITLE", value); }
+ QString genre() const { return tag(TagId::Genre) ;}
+ void setGenre(const QString &value) { setTag(TagId::Genre, value); }
 
- QString genre() const { return tag("GENRE") ;}
- void setGenre(const QString &value) { setTag("GENRE", value); }
+ QString date() const { return tag(TagId::Date) ;}
+ void setDate(const QString &value) { setTag(TagId::Date, value); }
 
- QString date() const { return tag("DATE") ;}
- void setDate(const QString &value) { setTag("DATE", value); }
+ QString diskId() const { return tag(TagId::DiscId) ;}
 
+ TrackNum trackNum() const;
+ void setTrackNum(TrackNum value);
+
+ TrackNum trackCount() const;
+ void setTrackCount(TrackNum value);
+
+ DiskNum diskNum() const;
+ void setDiskNum(DiskNum value);
+
+ DiskNum diskCount() const;
+ void setDiskCount(DiskNum value);
 
 QString resultFileName() const;
 QString resultFilePath() const;
 
- Disk *disk() const { return mDisk; }
- int index() const { return mIndex; }
-
- int trackNum() const;
- uint duration() const;
+ Duration duration() const { return mDuration; }
 
 CueIndex cueIndex(int indexNum) const;
 void setCueIndex(int indexNum, const CueIndex &value);
 
- virtual QString tag(const QString &tagName) const;
- virtual void setTag(const QString &tagName, const QString &value);
-
- int progress() const { return mProgress; }
- Status status() const { return mStatus; }
- void setProgress(Status status, int percent = -1);
 
 static QString calcFileName(const QString &pattern,
 int trackCount,
@@ -103,27 +111,66 @@
 const QString &date,
 const QString &fileExt);
 
+ QString cueFileName() const { return mCueFileName; }
+ void setCueFileName(const QString &value) { mCueFileName = value; }
+
+signals:
+ void tagChanged(TagId tagId);
+
 private:
- Disk *mDisk;
- int mIndex;
+ QHash<int, TagValue> mTags;
+ QTextCodec *mTextCodec;
 QVector<CueIndex> mCueIndexes;
- Status mStatus;
- int mProgress;
+ Duration mDuration;
+ QString mCueFileName;
 
 QString calcResultFilePath() const;
 static QString expandPattern(const QString &pattern, const QHash<QChar,QString> *tokens, bool optional);
 };
 
-Q_DECLARE_METATYPE(Track::Status)
 
+class Tracks: public QVector<Track>
+{
+public:
+ Tracks();
+ explicit Tracks(int size);
+ Tracks(const Tracks &other);
+ Tracks &operator=(const Tracks &other);
+ virtual ~Tracks();
+
+ QString uri() const { return mUri; }
+ void setUri(const QString &value) { mUri = value ;}
+
+ QString title() const;
+ void setTitle(const QByteArray &value);
+ void setTitle(const QString &value);
+
+private:
+ QString mUri;
+ TagValue mTitle;
+};
 
-class PreGapTrack: public Track
+class UcharDet
 {
+
 public:
- explicit PreGapTrack(Disk *disk);
+ UcharDet();
+ UcharDet(const UcharDet &) =delete;
+ UcharDet &operator =(const UcharDet &) =delete;
+ ~UcharDet();
+
+ void add(const Track &track);
+ UcharDet& operator<<(const Track &track);
+
 
- virtual QString tag(const QString &tagName) const;
- virtual void setTag(const QString &tagName, const QString &value);
+ QString textCodecName() const;
+ QTextCodec* textCodec() const;
+
+private:
+ struct Data;
+ Data *mData;
 };
 
+QTextCodec *determineTextCodec(const QVector<Track*> tracks);
+
 #endif // TRACK_H

flacon-4.1.0.tar.gz/translations/flacon_cs.desktop -> flacon-5.0.0.tar.gz/translations/flacon_cs.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_cs.ts -> flacon-5.0.0.tar.gz/translations/flacon_cs.ts Changed

@@ -242,14 +242,6 @@
 <translation>Vyberte adresář pro dočasné soubory</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>List CUE u skladby</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Vytvořit list CUE u skladby</translation>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -636,8 +688,18 @@
 <translation>Soubor CUE nenastaven.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Zvukový soubor je kratší než očekáváno podle listu CUE.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -656,7 +718,9 @@
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>Nelze přejmenovat soubor:⏎
+%1 na %2⏎
+%3</translation>
 </message>
 </context>
 <context>
@@ -821,18 +885,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Nastavení</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Nastavení programu</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;O programu Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Delete</translation>
 </message>
@@ -841,10 +897,6 @@
 <translation>Nastavit kodek</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Vybrat adresář s výsledky</translation>
 </message>
@@ -978,33 +1030,93 @@
 <translation>Použít &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Smazat nynější vzor z historie</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Nastavení</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>O programu Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Získat data z CDDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Vybrat soubor CUE</translation>
+ <translation type="unfinished"/>
 </message>
 <message>
- <source>Add cue or audio file</source>

flacon-4.1.0.tar.gz/translations/flacon_cs_CZ.desktop -> flacon-5.0.0.tar.gz/translations/flacon_cs_CZ.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_cs_CZ.ts -> flacon-5.0.0.tar.gz/translations/flacon_cs_CZ.ts Changed

@@ -242,14 +242,6 @@
 <translation>Vyberte adresář pro dočasné soubory</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>List CUE u skladby</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Vytvořit list CUE u skladby</translation>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -613,8 +665,18 @@
 <translation>Soubor CUE nenastaven.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Zvukový soubor je kratší než očekáváno podle listu CUE.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -633,7 +695,9 @@
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>Nelze přejmenovat soubor:⏎
+%1 na %2⏎
+%3</translation>
 </message>
 </context>
 <context>
@@ -798,18 +862,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Nastavení</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Nastavení programu</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;O programu Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Delete</translation>
 </message>
@@ -818,10 +874,6 @@
 <translation>Nastavit kodek</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Vybrat adresář s výsledky</translation>
 </message>
@@ -955,33 +1007,93 @@
 <translation>Použít &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Smazat nynější vzor z historie</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Nastavení</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>O programu Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Získat data z CDDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
 <translation>Vybrat soubor CUE</translation>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>

flacon-4.1.0.tar.gz/translations/flacon_de.desktop -> flacon-5.0.0.tar.gz/translations/flacon_de.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_de.ts -> flacon-5.0.0.tar.gz/translations/flacon_de.ts Changed

@@ -242,14 +242,6 @@
 <translation>Temporäres Verzeichnis auswählen</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Cue-Datei pro Stück</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Cue-Datei pro Stück erstellen</translation>
- </message>
- <message>
 <source> px</source>
 <translation> px</translation>
 </message>
@@ -272,25 +264,25 @@
 <message>
 <source>Update</source>
 <extracomment>Preferences tab title </extracomment>
- <translation type="unfinished"/>
+ <translation>Aktualisierung</translation>
 </message>
 <message>
 <source>Automatically check for updates</source>
- <translation type="unfinished"/>
+ <translation>Automatisch auf Aktualisierungen prüfen</translation>
 </message>
 <message>
 <source>Check now</source>
- <translation type="unfinished"/>
+ <translation>Jetzt prüfen</translation>
 </message>
 <message>
 <source>Last check was %1</source>
 <comment>Information about last update</comment>
- <translation type="unfinished"/>
+ <translation>Letzte Prüfung war %1</translation>
 </message>
 <message>
 <source>Never checked</source>
 <comment>Information about last update</comment>
- <translation type="unfinished"/>
+ <translation>Niemals geprüft</translation>
 </message>
 <message>
 <source>Keep original image size</source>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Größe ändern, wenn Bildgröße größer als</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation>Abtastratenkonvertierung</translation>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>44100 Hz</translation>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>48000 Hz</translation>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>96000 Hz</translation>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>192000 Hz</translation>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation>Maximale Bittiefe:</translation>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation>Maximale Abtastrate:</translation>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation>Gleich wie Quelle</translation>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>16 Bit</translation>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>24 Bit</translation>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>32 Bit</translation>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -637,8 +689,18 @@
 <translation>Kein Cue Sheet ausgewählt. </translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Audio Datei ist kürzer als im Cue Sheet angegeben.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation>Audiodatei ist kürzer als erwartet von der CUE-Datei.</translation>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -826,18 +888,10 @@
 <translation>Strg+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Einstellungen</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Programmeinstellungen</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Über Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Strg+Entf</translation>
 </message>
@@ -846,10 +900,6 @@
 <translation>Kodierer konfigurieren</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Ausgabeverzeichnis festlegen</translation>
 </message>
@@ -983,33 +1033,93 @@
 <translation>&quot;%1&quot; verwenden</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Aktuelles Muster aus Chronik löschen</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>Disk entfernen</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>Disk aus Projekt entfernen</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Einstellungen</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Über Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>

flacon-4.1.0.tar.gz/translations/flacon_el.desktop -> flacon-5.0.0.tar.gz/translations/flacon_el.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_el.ts -> flacon-5.0.0.tar.gz/translations/flacon_el.ts Changed

@@ -242,14 +242,6 @@
 <translation>Επιλογή προσωρινού καταλόγου</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Αναδιαμόρφωση ανά κομμάτι</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Δημιουργία ανά κομμάτι</translation>
- </message>
- <message>
 <source> px</source>
 <translation>πχ</translation>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Αλλαγή μεγέθους, αν το μέγεθος της εικόνας είναι μεγαλύτερο από</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -637,8 +689,18 @@
 <translation>Το αρχείο Cue δεν έχει οριστεί.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Το αρχείο ήχου είναι μικρότερο από το φύλλο cue.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -826,18 +888,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Προτιμήσεις</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Προτιμήσεις προγράμματος</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Σχετικά με το Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -846,10 +900,6 @@
 <translation>Ρύθμιση κωδικοποιητή</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Επιλέξτε το αποτέλεσμα directory</translation>
 </message>
@@ -983,33 +1033,93 @@
 <translation>Χρήση τού &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Διαγραφή τού τρέχον σχεδίου από το ιστορικό</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>Αφαίρεση δίσκου</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>Αφαίρεση δίσκου από το έργο</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Ρυθμίσεις</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Σχετκά με το Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Παροχή από το CDDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Επιλογή αρχείου cue</translation>
+ <translation type="unfinished"/>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>
 <comment>OpenFile dialog title</comment>
 <translation>Προσθήκη CUE η αρχείου ήχου</translation>
 </message>
 <message>
- <source>Delete current pattern from history</source>
- <translation>Διαγραφή τού τρέχον σχεδίου από το ιστορικό</translation>
+ <source>Edit all tags…</source>
+ <comment>Button text</comment>
+ <translation type="unfinished"/>
 </message>

flacon-4.1.0.tar.gz/translations/flacon_es.desktop -> flacon-5.0.0.tar.gz/translations/flacon_es.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_es.ts -> flacon-5.0.0.tar.gz/translations/flacon_es.ts Changed

@@ -242,14 +242,6 @@
 <translation>Seleccione un directorio temporal</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Hoja CUE por pista</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Crear una hoja CUE por pista</translation>
- </message>
- <message>
 <source> px</source>
 <translation>px</translation>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Ajustar tamaño si la imagen es mayor de</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation>Remuestreo</translation>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>44100 Hz</translation>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>48000 Hz</translation>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>96000 Hz</translation>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>192000 Hz</translation>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation>Máxima profundidad de bits:</translation>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation>Máxima tasa de muestreo:</translation>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -637,8 +689,18 @@
 <translation>El fichero CUE no se ha establecido.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>El archivo de audio es más pequeño de lo esperado por la hoja CUE.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -826,18 +888,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Preferencias</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Preferencias de programa</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Acerca de Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Supr</translation>
 </message>
@@ -846,10 +900,6 @@
 <translation>Configurar codificador</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Seleccione el directorio de destino</translation>
 </message>
@@ -983,34 +1033,94 @@
 <translation>Usar &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Eliminar el patrón actual del historial</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>Eliminar disco</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>Eliminar disco del proyecto</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Preferencias</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Acerca de Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Ubicación habitual de la música</translation>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Escritorio</translation>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>El mismo directorio que el archivo CUE</translation>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation>Eliminar directorio actual del historial</translation>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Obtener información de CDDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Selecciona el archivo CUE</translation>
+ <translation>Seleccione archivo CUE</translation>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Añadir archivo de audio o CUE</translation>
+ <translation>Agregar CUE o archivo de audio</translation>
 </message>
 <message>
- <source>Delete current pattern from history</source>
- <translation>Eliminar el patrón actual del historial</translation>
+ <source>Edit all tags…</source>
+ <comment>Button text</comment>
+ <translation type="unfinished"/>

flacon-4.1.0.tar.gz/translations/flacon_es_MX.desktop -> flacon-5.0.0.tar.gz/translations/flacon_es_MX.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_es_MX.ts -> flacon-5.0.0.tar.gz/translations/flacon_es_MX.ts Changed

@@ -242,14 +242,6 @@
 <translation>Seleccionar un directorio temporal</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Hoja cue por pista</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Crear hoja cue por pista</translation>
- </message>
- <message>
 <source> px</source>
 <translation>px</translation>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Redimensionar si el tamaño de la imagen es más grande de lo esperado</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -614,8 +666,18 @@
 <translation>No se especificó archivo cue.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Archivo de audio más corto de lo que se esperaba de la hoja cue.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -803,18 +865,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Preferencias</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Preferencias de programa</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>A&amp;cerca de Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Supr</translation>
 </message>
@@ -823,10 +877,6 @@
 <translation>Configurar codificación</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Seleccionar directorio destino</translation>
 </message>
@@ -959,34 +1009,94 @@
 <translation>Use &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Borrado el patrón actual del historial</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>Remover disco</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>Remover disco del proyecto</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Preferencias</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Acerca de Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Obtener información de CDDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Seleccione archivo cue</translation>
+ <translation>Seleccione un archivo CUE</translation>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Agregue un archivo de audio o cue</translation>
+ <translation>Agregar archivo CUE o de audio</translation>
 </message>
 <message>
- <source>Delete current pattern from history</source>
- <translation>Borrado el patrón actual del historial</translation>
+ <source>Edit all tags…</source>
+ <comment>Button text</comment>
+ <translation type="unfinished"/>

flacon-5.0.0.tar.gz/translations/flacon_et.desktop Added

flacon-4.1.0.tar.gz/translations/flacon_et.ts -> flacon-5.0.0.tar.gz/translations/flacon_et.ts Changed

@@ -242,14 +242,6 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -557,7 +609,7 @@
 </message>
 <message>
 <source>Disabled</source>
- <translation type="unfinished"/>
+ <translation>Keelatud</translation>
 </message>
 </context>
 <context>
@@ -605,7 +657,17 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
 <translation type="unfinished"/>
 </message>
 </context>
@@ -643,7 +705,7 @@
 <message>
 <source>Disabled</source>
 <comment>ReplayGain type combobox</comment>
- <translation type="unfinished"/>
+ <translation>Keelatud</translation>
 </message>
 <message>
 <source>Per Track</source>
@@ -787,18 +849,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Eelistused</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation type="unfinished"/>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -807,10 +861,6 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>...</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source>Select result directory</source>
 <translation type="unfinished"/>
 </message>
@@ -925,33 +975,93 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Eelistused</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>

flacon-4.1.0.tar.gz/translations/flacon_fr.desktop -> flacon-5.0.0.tar.gz/translations/flacon_fr.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_fr.ts -> flacon-5.0.0.tar.gz/translations/flacon_fr.ts Changed

@@ -242,20 +242,12 @@
 <translation>Sélectionner un répertoire temporaire</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Fichier cue par piste</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Créer un fichier cue par piste</translation>
- </message>
- <message>
 <source> px</source>
 <translation> px</translation>
 </message>
 <message>
 <source>Temporary directory:</source>
- <translation>Répertoire temporaire :</translation>
+ <translation>Répertoire temporaire :</translation>
 </message>
 <message>
 <source>Default codepage:</source>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Redimensionner si la taille de l’image est supérieure à</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation>Rééchantillonnage</translation>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>44 100 Hz</translation>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>48 000 Hz</translation>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>96 000 Hz</translation>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>192 000 Hz</translation>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation>Profondeur de bit maximale :</translation>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation>Fréquence d’échantillonnage maximale :</translation>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation>Fichier CUE par piste</translation>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation>Créer un fichier CUE par piste</translation>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation>Identique à la source</translation>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>16 bits</translation>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>24 bits</translation>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>32 bits</translation>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -504,7 +556,7 @@
 </message>
 <message>
 <source>Maximum bitrate:</source>
- <translation>Débit binaire maximum :</translation>
+ <translation>Débit binaire maximum :</translation>
 </message>
 <message>
 <source>Sets maximum bitrate (in kb/s).</source>
@@ -633,11 +685,21 @@
 </message>
 <message>
 <source>Cue file not set.</source>
- <translation>Le fichier cue n’est pas défini.</translation>
+ <translation>Le fichier CUE n’est pas défini.</translation>
+ </message>
+ <message>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation>Le fichier audio est plus court que prévu d’après le fichier CUE.</translation>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation>Un maximum de %1 bits par échantillon est pris en charge par ce format. Cette valeur sera utilisée pour l’encodage.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Le fichier audio est plus court que prévu d’après le fichier cue.</translation>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation>Un taux d’échantillonnage maximal de %1 est pris en charge par ce format. Cette valeur sera utilisée pour l’encodage.</translation>
 </message>
 </context>
 <context>
@@ -724,7 +786,7 @@
 </message>
 <message>
 <source>Result Files</source>
- <translation>Fichiers de sortie</translation>
+ <translation>Fichiers résultats</translation>
 </message>
 <message>
 <source>Directory:</source>
@@ -753,7 +815,7 @@
 </message>
 <message>
 <source>Year:</source>
- <translation>Année :</translation>
+ <translation>Année :</translation>
 </message>
 <message>
 <source>Artist:</source>
@@ -765,7 +827,7 @@
 </message>
 <message>
 <source>Start num:</source>
- <translation>Premier numéro :</translation>
+ <translation>Numéro de début :</translation>
 </message>
 <message>
 <source>Disc ID:</source>
@@ -789,7 +851,7 @@
 </message>
 <message>
 <source>Add CUE or audio file</source>
- <translation>Ajouter un fichier cue ou audio</translation>
+ <translation>Ajoute un fichier CUE ou audio</translation>
 </message>
 <message>
 <source>Ctrl+O</source>
@@ -801,7 +863,7 @@
 </message>
 <message>
 <source>Start conversion process</source>
- <translation>Démarrer le processus de conversion</translation>
+ <translation>Lancer le processus de conversion</translation>
 </message>
 <message>
 <source>Ctrl+W</source>
@@ -824,18 +886,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Préférences</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Préférences du programme</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;À propos de Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Suppr</translation>
 </message>
@@ -844,10 +898,6 @@
 <translation>Configurer l’encodeur</translation>
 </message>
 <message>
- <source>...</source>
- <translation>…</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Sélectionner le répertoire de destination</translation>
 </message>
@@ -952,7 +1002,7 @@
 .term {font-weight: bold;}

flacon-4.1.0.tar.gz/translations/flacon_gl.desktop -> flacon-5.0.0.tar.gz/translations/flacon_gl.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_gl.ts -> flacon-5.0.0.tar.gz/translations/flacon_gl.ts Changed

@@ -242,14 +242,6 @@
 <translation>Seleccione o directorio temporal</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -532,7 +584,7 @@
 </message>
 <message>
 <source>Bitrate:</source>
- <translation type="unfinished"/>
+ <translation>Taxa de bits:</translation>
 </message>
 <message>
 <source>VBR - variable bitrate</source>
@@ -628,7 +680,17 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
 <translation type="unfinished"/>
 </message>
 </context>
@@ -643,13 +705,15 @@
 <message>
 <source>I can&apos;t read %1 file</source>
 <comment>Encoder error. %1 is a file name.</comment>
- <translation type="unfinished"/>
+ <translation>Non se puido ler %1 ficheiro</translation>
 </message>
 <message>
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>Non se puido renomear o ficheiro:
+%1 como %2
+%3</translation>
 </message>
 </context>
 <context>
@@ -815,18 +879,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Preferencias</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Preferencias de programas</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Sobre Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -835,10 +891,6 @@
 <translation>Configurar o codificador</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Seleccione o directorio resultante</translation>
 </message>
@@ -954,33 +1006,93 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Select cue file</source>
- <comment>OpenFile dialog title</comment>
+ <source>Delete current pattern from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Preferencias</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Sobre Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Add cue or audio file</source>

flacon-5.0.0.tar.gz/translations/flacon_he.desktop Added

flacon-5.0.0.tar.gz/translations/flacon_he.ts Added

@@ -0,0 +1,1426 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1">
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <source>About Flacon</source>
+ <translation>אודות Flacon</translation>
+ </message>
+ <message>
+ <source>About</source>
+ <translation>אודות</translation>
+ </message>
+ <message>
+ <source>Author</source>
+ <translation>יוצר</translation>
+ </message>
+ <message>
+ <source>Thanks</source>
+ <translation>תודות</translation>
+ </message>
+ <message>
+ <source>Translations</source>
+ <translation>תירגום</translation>
+ </message>
+ <message>
+ <source>External programs</source>
+ <translation>תכניות צד שלישי</translation>
+ </message>
+ <message>
+ <source>Homepage: %1</source>
+ <translation>עמוד הבית: %1</translation>
+ </message>
+ <message>
+ <source>License: %1</source>
+ <translation>רישון: %1</translation>
+ </message>
+ <message>
+ <source>Special thanks to:</source>
+ <translation>תודות מיוחדות ל:</translation>
+ </message>
+ <message>
+ <source>Flacon uses external programs. Many thanks to their authors!</source>
+ <translation>Flacon עושה שימוש בתוכנות צד שלישי. הרבה תודה ליוצריהן!</translation>
+ </message>
+ <message>
+ <source>Extracts individual tracks from one big audio file containing the entire album.</source>
+ <translation>מחלץ רצועות בודדות מקובץ אודיו אחד גדול המכיל את האלבום כולו.</translation>
+ </message>
+ <message>
+ <source>Copyright: %1-%2 %3</source>
+ <translation>זכויות יוצרים: %1-%2 %3</translation>
+ </message>
+ <message>
+ <source>WavPack support patch</source>
+ <translation>תיקון תמיכת WavPack</translation>
+ </message>
+ <message>
+ <source>Packaging, testing</source>
+ <translation>אריזה, בדיקה</translation>
+ </message>
+ <message>
+ <source>Improvements in the UI</source>
+ <translation>שיפורים בממשק משתמש</translation>
+ </message>
+ <message>
+ <source>Flacon account on github.com</source>
+ <translation>חשבון Flacon ב github.com</translation>
+ </message>
+ <message>
+ <source>Bug tracker %1</source>
+ <comment>About dialog, About tab</comment>
+ <translation>מעקב תקלות %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>Flacon מתורגם לשפות רבות בזכות עבודתם של צוותי התרגום של Flacon באמצעות &lt;a href=&apos;%1&apos;&gt; Transifex &lt;/a&gt;.</translation>
+ </message>
+</context>
+<context>
+ <name>CodePageComboBox</name>
+ <message>
+ <source>Auto detect</source>
+ <comment>Codepage auto detection</comment>
+ <translation>זיהוי אוטומטי</translation>
+ </message>
+ <message>
+ <source>Unicode (UTF-8)</source>
+ <translation>Unicode (UTF-8)</translation>
+ </message>
+ <message>
+ <source>Unicode (UTF-16LE)</source>
+ <translation>Unicode (UTF-16LE)</translation>
+ </message>
+ <message>
+ <source>Unicode (UTF-16BE)</source>
+ <translation>Unicode (UTF-16BE)</translation>
+ </message>
+ <message>
+ <source>Cyrillic (Win-1251)</source>
+ <translation>Cyrillic (Win-1251)</translation>
+ </message>
+ <message>
+ <source>Cyrillic (CP-866)</source>
+ <translation>Cyrillic (CP-866)</translation>
+ </message>
+ <message>
+ <source>Latin-1 (ISO-8859-1)</source>
+ <translation>Latin-1 (ISO-8859-1)</translation>
+ </message>
+ <message>
+ <source>Latin-2 (ISO-8859-2)</source>
+ <translation>Latin-2 (ISO-8859-2)</translation>
+ </message>
+ <message>
+ <source>Latin-3 (ISO-8859-3)</source>
+ <translation>Latin-3 (ISO-8859-3)</translation>
+ </message>
+ <message>
+ <source>Latin-4 (ISO-8859-4)</source>
+ <translation>Latin-4 (ISO-8859-4)</translation>
+ </message>
+ <message>
+ <source>Latin-5 (ISO-8859-5)</source>
+ <translation>Latin-5 (ISO-8859-5)</translation>
+ </message>
+ <message>
+ <source>Latin-6 (ISO-8859-6)</source>
+ <translation>Latin-6 (ISO-8859-6)</translation>
+ </message>
+ <message>
+ <source>Latin-7 (ISO-8859-7)</source>
+ <translation>Latin-7 (ISO-8859-7)</translation>
+ </message>
+ <message>
+ <source>Latin-8 (ISO-8859-8)</source>
+ <translation>Latin-8 (ISO-8859-8)</translation>
+ </message>
+ <message>
+ <source>Latin-9 (ISO-8859-9)</source>
+ <translation>Latin-9 (ISO-8859-9)</translation>
+ </message>
+ <message>
+ <source>Latin-10 (ISO-8859-10)</source>
+ <translation>Latin-10 (ISO-8859-10)</translation>
+ </message>
+ <message>
+ <source>Latin-13 (ISO-8859-13)</source>
+ <translation>Latin-13 (ISO-8859-13)</translation>
+ </message>
+ <message>
+ <source>Latin-14 (ISO-8859-14)</source>
+ <translation>Latin-14 (ISO-8859-14)</translation>
+ </message>
+ <message>
+ <source>Latin-15 (ISO-8859-15)</source>
+ <translation>Latin-15 (ISO-8859-15)</translation>
+ </message>
+ <message>
+ <source>Latin-16 (ISO-8859-16)</source>
+ <translation>Latin-16 (ISO-8859-16)</translation>
+ </message>
+ <message>
+ <source>Windows 1250</source>
+ <translation>Windows 1250</translation>
+ </message>
+ <message>
+ <source>Windows 1252</source>
+ <translation>Windows 1252</translation>
+ </message>
+ <message>
+ <source>Windows 1253</source>
+ <translation>Windows 1253</translation>
+ </message>
+ <message>
+ <source>Windows 1254</source>
+ <translation>Windows 1254</translation>
+ </message>
+ <message>
+ <source>Windows 1255</source>
+ <translation>Windows 1255</translation>
+ </message>
+ <message>
+ <source>Windows 1256</source>
+ <translation>Windows 1256</translation>
+ </message>
+ <message>
+ <source>Windows 1257</source>
+ <translation>Windows 1257</translation>
+ </message>
+ <message>
+ <source>Windows 1258</source>
+ <translation>Windows 1258</translation>
+ </message>
+</context>
+<context>
+ <name>ConfigDialog</name>
+ <message>
+ <source>Preferences</source>
+ <translation>העדפות</translation>
+ </message>

flacon-4.1.0.tar.gz/translations/flacon_hu.desktop -> flacon-5.0.0.tar.gz/translations/flacon_hu.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_hu.ts -> flacon-5.0.0.tar.gz/translations/flacon_hu.ts Changed

@@ -242,14 +242,6 @@
 <translation>Válasszon ideiglenes könyvtárt</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source> px</source>
 <translation>px</translation>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Átméretezés, ha a képfájl mérete nagyobb, mint</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -605,8 +657,18 @@
 <translation>Cue-fájl nincs beállíŧva</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Az audio fájl rövidebb, mint a rendezői példányból elvárt.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -794,18 +856,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Beállítások</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>A program beállításai</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>Flacon &amp;névjegye</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -814,10 +868,6 @@
 <translation>Átalakító beállítása</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Eredmények mappa kiválaszása</translation>
 </message>
@@ -951,33 +1001,93 @@
 <translation>&quot;%1&quot; használata</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Az aktuális minta törlése az előzményekből</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>Lemez eltávolítása</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>Lemez eltávolítása a projektből</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Beállítások</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Flacon névjegye</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Adatok megszerzése a CDDB-ből</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Cue-fájl kiválasztása</translation>
+ <translation type="unfinished"/>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>
 <comment>OpenFile dialog title</comment>
 <translation>Cue vagy audio-fájl hozzáadása</translation>
 </message>
 <message>
- <source>Delete current pattern from history</source>
- <translation>Az aktuális minta törlése az előzményekből</translation>
+ <source>Edit all tags…</source>
+ <comment>Button text</comment>
+ <translation type="unfinished"/>
 </message>

flacon-5.0.0.tar.gz/translations/flacon_id.desktop Added

flacon-5.0.0.tar.gz/translations/flacon_id.ts Added

@@ -0,0 +1,1376 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="id" version="2.1">
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <source>About Flacon</source>
+ <translation>Tentang Flacon</translation>
+ </message>
+ <message>
+ <source>About</source>
+ <translation>Tentang</translation>
+ </message>
+ <message>
+ <source>Author</source>
+ <translation>Pembuat</translation>
+ </message>
+ <message>
+ <source>Thanks</source>
+ <translation>Terimakasih</translation>
+ </message>
+ <message>
+ <source>Translations</source>
+ <translation>Terjemahan</translation>
+ </message>
+ <message>
+ <source>External programs</source>
+ <translation>Program eksternal</translation>
+ </message>
+ <message>
+ <source>Homepage: %1</source>
+ <translation>Halaman utama: %1</translation>
+ </message>
+ <message>
+ <source>License: %1</source>
+ <translation>Lisensi: %1</translation>
+ </message>
+ <message>
+ <source>Special thanks to:</source>
+ <translation>Ucapan terimakasih untuk:</translation>
+ </message>
+ <message>
+ <source>Flacon uses external programs. Many thanks to their authors!</source>
+ <translation>Flacon menggunakan program pihak ketiga. Terimakasih banyak kepada para pengembang! </translation>
+ </message>
+ <message>
+ <source>Extracts individual tracks from one big audio file containing the entire album.</source>
+ <translation>Ekstrak setiap lagu dari satu file audio besar yang berisi seluruh album.</translation>
+ </message>
+ <message>
+ <source>Copyright: %1-%2 %3</source>
+ <translation>Copyright: %1-%2 %3</translation>
+ </message>
+ <message>
+ <source>WavPack support patch</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Packaging, testing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Improvements in the UI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Flacon account on github.com</source>
+ <translation>Akun Flacon di github.com</translation>
+ </message>
+ <message>
+ <source>Bug tracker %1</source>
+ <comment>About dialog, About tab</comment>
+ <translation type="unfinished"/>
+ </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>Flacon telah diterjemahkan kedalam banyak bahasa, terimakasih atas pekerjaan Tim Penerjemah Flacon dalam &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt;</translation>
+ </message>
+</context>
+<context>
+ <name>CodePageComboBox</name>
+ <message>
+ <source>Auto detect</source>
+ <comment>Codepage auto detection</comment>
+ <translation>Deteksi otomatis</translation>
+ </message>
+ <message>
+ <source>Unicode (UTF-8)</source>
+ <translation>Unicode (UTF-8)</translation>
+ </message>
+ <message>
+ <source>Unicode (UTF-16LE)</source>
+ <translation>Unicode (UTF-16LE)</translation>
+ </message>
+ <message>
+ <source>Unicode (UTF-16BE)</source>
+ <translation>Unicode (UTF-16BE)</translation>
+ </message>
+ <message>
+ <source>Cyrillic (Win-1251)</source>
+ <translation>Cyrillic (Win-1251)</translation>
+ </message>
+ <message>
+ <source>Cyrillic (CP-866)</source>
+ <translation>Cyrillic (CP-866)</translation>
+ </message>
+ <message>
+ <source>Latin-1 (ISO-8859-1)</source>
+ <translation>Latin-1 (ISO-8859-1)</translation>
+ </message>
+ <message>
+ <source>Latin-2 (ISO-8859-2)</source>
+ <translation>Latin-2 (ISO-8859-2)</translation>
+ </message>
+ <message>
+ <source>Latin-3 (ISO-8859-3)</source>
+ <translation>Latin-3 (ISO-8859-3)</translation>
+ </message>
+ <message>
+ <source>Latin-4 (ISO-8859-4)</source>
+ <translation>Latin-4 (ISO-8859-4)</translation>
+ </message>
+ <message>
+ <source>Latin-5 (ISO-8859-5)</source>
+ <translation>Latin-5 (ISO-8859-5)</translation>
+ </message>
+ <message>
+ <source>Latin-6 (ISO-8859-6)</source>
+ <translation>Latin-6 (ISO-8859-6)</translation>
+ </message>
+ <message>
+ <source>Latin-7 (ISO-8859-7)</source>
+ <translation>Latin-7 (ISO-8859-7)</translation>
+ </message>
+ <message>
+ <source>Latin-8 (ISO-8859-8)</source>
+ <translation>Latin-8 (ISO-8859-8)</translation>
+ </message>
+ <message>
+ <source>Latin-9 (ISO-8859-9)</source>
+ <translation>Latin-9 (ISO-8859-9)</translation>
+ </message>
+ <message>
+ <source>Latin-10 (ISO-8859-10)</source>
+ <translation>Latin-10 (ISO-8859-10)</translation>
+ </message>
+ <message>
+ <source>Latin-13 (ISO-8859-13)</source>
+ <translation>Latin-13 (ISO-8859-13)</translation>
+ </message>
+ <message>
+ <source>Latin-14 (ISO-8859-14)</source>
+ <translation>Latin-14 (ISO-8859-14)</translation>
+ </message>
+ <message>
+ <source>Latin-15 (ISO-8859-15)</source>
+ <translation>Latin-15 (ISO-8859-15)</translation>
+ </message>
+ <message>
+ <source>Latin-16 (ISO-8859-16)</source>
+ <translation>Latin-16 (ISO-8859-16)</translation>
+ </message>
+ <message>
+ <source>Windows 1250</source>
+ <translation>Windows 1250</translation>
+ </message>
+ <message>
+ <source>Windows 1252</source>
+ <translation>Windows 1252</translation>
+ </message>
+ <message>
+ <source>Windows 1253</source>
+ <translation>Windows 1253</translation>
+ </message>
+ <message>
+ <source>Windows 1254</source>
+ <translation>Windows 1254</translation>
+ </message>
+ <message>
+ <source>Windows 1255</source>
+ <translation>Windows 1255</translation>
+ </message>
+ <message>
+ <source>Windows 1256</source>
+ <translation>Windows 1256</translation>
+ </message>
+ <message>
+ <source>Windows 1257</source>
+ <translation>Windows 1257</translation>
+ </message>
+ <message>
+ <source>Windows 1258</source>
+ <translation>Windows 1258</translation>
+ </message>
+</context>
+<context>
+ <name>ConfigDialog</name>
+ <message>
+ <source>Preferences</source>
+ <translation>Setelan</translation>
+ </message>

flacon-4.1.0.tar.gz/translations/flacon_it.desktop -> flacon-5.0.0.tar.gz/translations/flacon_it.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_it.ts -> flacon-5.0.0.tar.gz/translations/flacon_it.ts Changed

@@ -242,14 +242,6 @@
 <translation>Seleziona cartella temporanea</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -532,7 +584,7 @@
 </message>
 <message>
 <source>Bitrate:</source>
- <translation type="unfinished"/>
+ <translation>Bitrate:</translation>
 </message>
 <message>
 <source>VBR - variable bitrate</source>
@@ -628,7 +680,17 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
 <translation type="unfinished"/>
 </message>
 </context>
@@ -643,13 +705,15 @@
 <message>
 <source>I can&apos;t read %1 file</source>
 <comment>Encoder error. %1 is a file name.</comment>
- <translation type="unfinished"/>
+ <translation>Impossibile leggere %1 file</translation>
 </message>
 <message>
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>Impossibile rinominare il file:
+%1 a %2
+%3</translation>
 </message>
 </context>
 <context>
@@ -815,18 +879,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Preferenze</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Preferenze del programma</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Informazioni su Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -835,10 +891,6 @@
 <translation>Configura il codificatore</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Seleziona la cartella di destinazione</translation>
 </message>
@@ -967,36 +1019,96 @@
 <message>
 <source>Use &quot;%1&quot;</source>
 <comment>Predefined out file pattern, string like 'Use &quot;%a/%A/%n - %t&quot;'</comment>
+ <translation>Usa &quot;%1&quot;</translation>
+ </message>
+ <message>
+ <source>Delete current pattern from history</source>
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Select cue file</source>
- <comment>OpenFile dialog title</comment>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Preferences</source>
+ <translation>Preferenze</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Informazioni su Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>

flacon-4.1.0.tar.gz/translations/flacon_ja_JP.desktop -> flacon-5.0.0.tar.gz/translations/flacon_ja_JP.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_ja_JP.ts -> flacon-5.0.0.tar.gz/translations/flacon_ja_JP.ts Changed

@@ -242,14 +242,6 @@
 <translation>一時ディレクトリを選択</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -605,7 +657,17 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
 <translation type="unfinished"/>
 </message>
 </context>
@@ -620,13 +682,15 @@
 <message>
 <source>I can&apos;t read %1 file</source>
 <comment>Encoder error. %1 is a file name.</comment>
- <translation type="unfinished"/>
+ <translation>%1ファイルが読めません。</translation>
 </message>
 <message>
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>ファイルをリネームできません:
+%1 から %2
+%3</translation>
 </message>
 </context>
 <context>
@@ -790,18 +854,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Preferences参照</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>プログラム参照</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;About Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -810,10 +866,6 @@
 <translation>エンコーダー設定</translation>
 </message>
 <message>
- <source>...</source>
- <translation>…</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>一時ディレクトリを選択</translation>
 </message>
@@ -925,36 +977,96 @@
 <message>
 <source>Use &quot;%1&quot;</source>
 <comment>Predefined out file pattern, string like 'Use &quot;%a/%A/%n - %t&quot;'</comment>
+ <translation> &quot;%1&quot;を使う</translation>
+ </message>
+ <message>
+ <source>Delete current pattern from history</source>
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Select cue file</source>
- <comment>OpenFile dialog title</comment>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>参照</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Flacon/フラッコンについて</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>

flacon-4.1.0.tar.gz/translations/flacon_lt.desktop -> flacon-5.0.0.tar.gz/translations/flacon_lt.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_lt.ts -> flacon-5.0.0.tar.gz/translations/flacon_lt.ts Changed

@@ -242,14 +242,6 @@
 <translation>Pasirinkite laikiną katalogą</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Kiekvieno takelio cue lapas</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Kurti kiekvieno takelio cue lapą</translation>
- </message>
- <message>
 <source> px</source>
 <translation> piks.</translation>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Keisti dydį, jei paveikslo dydis didesnis nei</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation>Ėminių atrankos keitimas</translation>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>44100 Hz</translation>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>48000 Hz</translation>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>96000 Hz</translation>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>192000 Hz</translation>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation>Didžiausias bitų gylis:</translation>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation>Didžiausias skaitmeninimo dažnis:</translation>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation>Kiekvieno takelio CUE lapas</translation>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation>Kurti kiekvieno takelio CUE lapą</translation>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation>Toks pats kaip šaltinio</translation>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>16-bitų</translation>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>24-bitų</translation>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>32-bitų</translation>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -637,8 +689,18 @@
 <translation>Nenustatytas cue failas.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Garso failas yra trumpesnis nei buvo tikimasi cue lape.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation>Garso failas yra trumpesnis nei buvo tikimasi CUE lape.</translation>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation>Šis formatas palaiko daugiausiai %1-bitų vienam ėminiui. Ši reikšmė bus naudojama kodavimui.</translation>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation>Šis formatas palaiko daugiausiai %1 skaitmeninimo dažnį. Ši reikšmė bus naudojama kodavimui.</translation>
 </message>
 </context>
 <context>
@@ -826,18 +888,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Nuostatos</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Programos nuostatos</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Apie Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -846,10 +900,6 @@
 <translation>Konfigūruoti koduotuvą</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Pasirinkite galutinį katalogą</translation>
 </message>
@@ -983,34 +1033,94 @@
 <translation>Naudoti &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Ištrinti esamą šabloną iš istorijos</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>Šalinti diską</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>Šalinti diską iš projekto</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Nuostatos</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Apie Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Standartinė muzikos vieta</translation>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Darbalaukis</translation>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Tas pats katalogas kaip ir CUE failo</translation>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation>Šalinti esamą katalogą iš istorijos</translation>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Gauti duomenis iš CDDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Pasirinkite cue failą</translation>
+ <translation>Pasirinkite CUE failą</translation>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Pridėti cue ar garso failą</translation>
+ <translation>Pridėti CUE ar garso failą</translation>
 </message>
 <message>
- <source>Delete current pattern from history</source>
- <translation>Ištrinti esamą šabloną iš istorijos</translation>
+ <source>Edit all tags…</source>
+ <comment>Button text</comment>
+ <translation>Taisyti visas žymes…</translation>

flacon-4.1.0.tar.gz/translations/flacon_ms_MY.desktop -> flacon-5.0.0.tar.gz/translations/flacon_ms_MY.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_ms_MY.ts -> flacon-5.0.0.tar.gz/translations/flacon_ms_MY.ts Changed

@@ -242,14 +242,6 @@
 <translation>Pilih direktori sementara</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Per lembar kiu trek</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Cipta per lembar kiu trek</translation>
- </message>
- <message>
 <source> px</source>
 <translation>px</translation>
 </message>
@@ -272,25 +264,25 @@
 <message>
 <source>Update</source>
 <extracomment>Preferences tab title </extracomment>
- <translation type="unfinished"/>
+ <translation>Kemaskini</translation>
 </message>
 <message>
 <source>Automatically check for updates</source>
- <translation type="unfinished"/>
+ <translation>Periksa kemaskini secara automatik</translation>
 </message>
 <message>
 <source>Check now</source>
- <translation type="unfinished"/>
+ <translation>Periksa sekarang</translation>
 </message>
 <message>
 <source>Last check was %1</source>
 <comment>Information about last update</comment>
- <translation type="unfinished"/>
+ <translation>Periksa terakhir pada %1</translation>
 </message>
 <message>
 <source>Never checked</source>
 <comment>Information about last update</comment>
- <translation type="unfinished"/>
+ <translation>Jangan sesekali periksa</translation>
 </message>
 <message>
 <source>Keep original image size</source>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Saiz semula jika saiz imej lebih besar</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation>Persampelan Semula</translation>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>44100 Hz</translation>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>48000 Hz</translation>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>96000 Hz</translation>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>192000 Hz</translation>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation>Kedalaman bit maksimum:</translation>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation>Kadar sampel maksimum:</translation>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation>Per lembar CUE trek</translation>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation>Cipta per lembar CUE trek</translation>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation>Sama seperti sumber</translation>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>16-bit</translation>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>24-bit</translation>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>32-bit</translation>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -637,8 +689,18 @@
 <translation>Fail cue tidak ditetapkan.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Fail audio lebih pendek berbanding dijangka dari lembar cue.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation>Fail audio lebih pendek berbanding lembar CUE.</translation>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation>Satu sampel per %1-bit maksimum disokong oleh format ini. Nilai ini akan digunakan untuk pengekodan.</translation>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation>Satu kadar sampel maksimum %1 disokong oleh format ini. Nilai ini akan digunakan untuk pengekodan.</translation>
 </message>
 </context>
 <context>
@@ -827,18 +889,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Keutamaan</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Keutamaan program</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Perihal Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -847,10 +901,6 @@
 <translation>Konfigur pengekod</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Pilih direktori hasil</translation>
 </message>
@@ -984,34 +1034,94 @@
 <translation>Guna &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Padam pola semasa dari sejarah</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>Tanggalkan cakera</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>Tanggalkan cakera dari projek</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Keutamaan</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Perihal Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Lokasi muzik piawai</translation>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Desktop</translation>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>

flacon-4.1.0.tar.gz/translations/flacon_nb.desktop -> flacon-5.0.0.tar.gz/translations/flacon_nb.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_nb.ts -> flacon-5.0.0.tar.gz/translations/flacon_nb.ts Changed

@@ -242,14 +242,6 @@
 <translation>Velg midlertidig mappe</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>CUE-innholdsfortegnelse per spor</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Opprett CUE-innholdsfortegnelse per spor</translation>
- </message>
- <message>
 <source> px</source>
 <translation>px</translation>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Endre oppløsning på bilde hvis større enn</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -637,8 +689,18 @@
 <translation>Cue-fil ikke fastsatt.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Lydfil kortere enn forventet fra CUE-innholdsfortegnelse.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -826,18 +888,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Egenskaper</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Programegenskaper</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Om Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -846,10 +900,6 @@
 <translation>Sett opp koder</translation>
 </message>
 <message>
- <source>...</source>
- <translation> …</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Velg endelig mappe</translation>
 </message>
@@ -983,33 +1033,93 @@
 <translation>Bruk &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Slett gjeldende mønster fra historikk</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Innstillinger</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Om Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Innhent data fra CCDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Velg CUE-fil</translation>
+ <translation type="unfinished"/>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>
 <comment>OpenFile dialog title</comment>
 <translation>Legg til CUE eller lydfil</translation>
 </message>
 <message>
- <source>Delete current pattern from history</source>
- <translation>Slett gjeldende mønster fra historikk</translation>
+ <source>Edit all tags…</source>
+ <comment>Button text</comment>
+ <translation type="unfinished"/>
 </message>

flacon-4.1.0.tar.gz/translations/flacon_nl.desktop -> flacon-5.0.0.tar.gz/translations/flacon_nl.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_nl.ts -> flacon-5.0.0.tar.gz/translations/flacon_nl.ts Changed

@@ -242,14 +242,6 @@
 <translation>Kies tijdelijke map</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Cueblad per nummer</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Maak cueblad aan per nummer</translation>
- </message>
- <message>
 <source> px</source>
 <translation>px</translation>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Schalen indien afbeelding groter is dan</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -637,8 +689,18 @@
 <translation>Cuebestand niet ingesteld.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Audiobestand korter dan verwacht van cuebestand.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -826,18 +888,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Voorkeuren</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Programmavoorkeuren</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Over Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -846,10 +900,6 @@
 <translation>Configureer encoder</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Kies resultaatmap</translation>
 </message>
@@ -983,34 +1033,94 @@
 <translation>Gebruik ‘%1’</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Huidig patroon van geschiedenis verwijderen</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>Schijf verwijderen</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>Schijf verwijderen van project</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Voorkeuren</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Over Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Gegevens ophalen van CDDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Kies cuebestand</translation>
+ <translation type="unfinished"/>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Cue- of audiobestand toevoegen</translation>
+ <translation>CUE- of audiobestand toevoegen</translation>
 </message>
 <message>
- <source>Delete current pattern from history</source>
- <translation>Huidig patroon van geschiedenis verwijderen</translation>
+ <source>Edit all tags…</source>
+ <comment>Button text</comment>
+ <translation type="unfinished"/>

flacon-4.1.0.tar.gz/translations/flacon_nl_BE.desktop -> flacon-5.0.0.tar.gz/translations/flacon_nl_BE.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_nl_BE.ts -> flacon-5.0.0.tar.gz/translations/flacon_nl_BE.ts Changed

flacon-4.1.0.tar.gz/translations/flacon_pl.desktop -> flacon-5.0.0.tar.gz/translations/flacon_pl.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_pl.ts -> flacon-5.0.0.tar.gz/translations/flacon_pl.ts Changed

@@ -242,14 +242,6 @@
 <translation>Wybierz katalog tymczasowy</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -531,7 +583,7 @@
 </message>
 <message>
 <source>Bitrate:</source>
- <translation type="unfinished"/>
+ <translation>Prędkość przepływu bitów:</translation>
 </message>
 <message>
 <source>VBR - variable bitrate</source>
@@ -627,7 +679,17 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
 <translation type="unfinished"/>
 </message>
 </context>
@@ -642,13 +704,15 @@
 <message>
 <source>I can&apos;t read %1 file</source>
 <comment>Encoder error. %1 is a file name.</comment>
- <translation type="unfinished"/>
+ <translation>Nie można odczytać pliku %1</translation>
 </message>
 <message>
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>Nie można zmienić nazwy pliku:
+%1 na %2
+%3</translation>
 </message>
 </context>
 <context>
@@ -814,18 +878,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Ustawienia</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Ustawienia programu</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;O programie Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -834,10 +890,6 @@
 <translation>Konfiguruj kodek</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Wybierz katalog docelowy</translation>
 </message>
@@ -966,36 +1018,96 @@
 <message>
 <source>Use &quot;%1&quot;</source>
 <comment>Predefined out file pattern, string like 'Use &quot;%a/%A/%n - %t&quot;'</comment>
+ <translation>Użyj &quot;%1&quot;</translation>
+ </message>
+ <message>
+ <source>Delete current pattern from history</source>
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Select cue file</source>
- <comment>OpenFile dialog title</comment>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Ustawienia</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>O programie Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
 <translation type="unfinished"/>

flacon-4.1.0.tar.gz/translations/flacon_pl_PL.desktop -> flacon-5.0.0.tar.gz/translations/flacon_pl_PL.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_pl_PL.ts -> flacon-5.0.0.tar.gz/translations/flacon_pl_PL.ts Changed

@@ -242,14 +242,6 @@
 <translation>Wybierz katalog tymczasowy</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Arkusze CUE dla ścieżek</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Twórz arkusze CUE dla poszczególnych ścieżek</translation>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -613,8 +665,18 @@
 <translation>Nie określono pliku CUE.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Plik audio jest krótszy, niż wynika z arkusza CUE</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -634,7 +696,9 @@
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>Nie można zmienić nazwy pliku:
+%1 na %2
+%3</translation>
 </message>
 </context>
 <context>
@@ -800,18 +864,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Ustawienia</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Ustawienia programu</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;O programie Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -820,10 +876,6 @@
 <translation>Konfiguruj kodek</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Wybierz katalog docelowy</translation>
 </message>
@@ -957,33 +1009,93 @@
 <translation>Użyj &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Usuń bieżący wzorzec z historii</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Ustawienia</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>O programie Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Pobierz dane z CDDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
 <translation>Wybierz plik CUE</translation>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>

flacon-4.1.0.tar.gz/translations/flacon_pt_BR.desktop -> flacon-5.0.0.tar.gz/translations/flacon_pt_BR.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_pt_BR.ts -> flacon-5.0.0.tar.gz/translations/flacon_pt_BR.ts Changed

@@ -242,14 +242,6 @@
 <translation>Selecionar diretório temporário</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Arquivo cue por faixa</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Criar um arquivo cue por faixa</translation>
- </message>
- <message>
 <source> px</source>
 <translation> px</translation>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Diminuir se o tamanho da imagem for maior que</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation>Reamostra</translation>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>44100 Hz</translation>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>48000 Hz</translation>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>96000 Hz</translation>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>192000 Hz</translation>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation>Profundidade de bits máxima:</translation>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation>Taxa de amostra máxima:</translation>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation>Arquivo CUE por faixa</translation>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation>Criar arquivo CUE por faixa</translation>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation>Igual à fonte</translation>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>16-bit</translation>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>24-bit</translation>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>32-bit</translation>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -637,8 +689,18 @@
 <translation>Arquivo cue não indicado.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Arquivo de áudio menor que o esperado do arquivo cue.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation>Arquivo de áudio menor que o esperado pelo arquivo CUE.</translation>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation>O formato suporta no máximo %1 -bits por amostra. Esse valor será usado na codificação.</translation>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation>O formato suporta no máximo %1 de taxa de amostra. Esse valor será usado na codificação.</translation>
 </message>
 </context>
 <context>
@@ -822,18 +884,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Preferências</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Preferências do programa</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>So&amp;bre o Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -842,10 +896,6 @@
 <translation>Configurar codificador</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Selecione o diretório de destino</translation>
 </message>
@@ -979,35 +1029,95 @@
 <translation>Usar &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
- <comment>OpenFile dialog title</comment>
- <translation>Selecione o arquivo cue</translation>
+ <source>Delete current pattern from history</source>
+ <translation>Apagar o padrão atual do histórico</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>Remover disco</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>Remover disco do projeto</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Configurações</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Sobre o Flacon</translation>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Localização de músicas padrão</translation>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Área de trabalho</translation>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Mesma pasta do arquivo CUE</translation>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation>Remover pasta atual do histórico</translation>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Obter dados do CDDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Adicione arquivo de áudio ou cue</translation>
+ <translation>Selecione o arquivo CUE</translation>
 </message>
 <message>
- <source>Delete current pattern from history</source>
- <translation>Apagar o padrão atual do histórico</translation>
+ <source>Add CUE or audio file</source>
+ <comment>OpenFile dialog title</comment>
+ <translation>Adicione arquivo CUE ou áudio</translation>
 </message>
 <message>
- <source>Add disk</source>
- <translation>Adicionar disco</translation>

flacon-4.1.0.tar.gz/translations/flacon_pt_PT.desktop -> flacon-5.0.0.tar.gz/translations/flacon_pt_PT.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_pt_PT.ts -> flacon-5.0.0.tar.gz/translations/flacon_pt_PT.ts Changed

@@ -242,14 +242,6 @@
 <translation>Seleccionar pasta temporária</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -610,7 +662,17 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
 <translation type="unfinished"/>
 </message>
 </context>
@@ -631,7 +693,9 @@
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>Não posso mudar o nome do ficheiro:
+%1 para %2
+%3</translation>
 </message>
 </context>
 <context>
@@ -797,18 +861,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Preferências</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Preferências do programa</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Sobre o Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -817,10 +873,6 @@
 <translation>Configurar codificador</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Seleccionar a pasta de destino</translation>
 </message>
@@ -952,33 +1004,93 @@
 <translation>Use &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Preferências</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Sobre Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Obter dados de CDDB</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Seleccione um ficheiro cue</translation>
+ <translation>Selecionar ficheiro CUE</translation>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>
 <comment>OpenFile dialog title</comment>

flacon-4.1.0.tar.gz/translations/flacon_ro_RO.desktop -> flacon-5.0.0.tar.gz/translations/flacon_ro_RO.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_ro_RO.ts -> flacon-5.0.0.tar.gz/translations/flacon_ro_RO.ts Changed

@@ -242,14 +242,6 @@
 <translation>Alegere director fișiere temporare</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Listă de indexare pentru fiecare track</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Creare listă de indexare pentru fiecare pistă</translation>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -637,8 +689,18 @@
 <translation>Lista de indexare nu este specificată</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Fișierul audio este mai scurt decât era specificat în lista de indexare.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -658,7 +720,9 @@
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>Nu se poate redenumi fișierul:
+%1 to %2
+%3</translation>
 </message>
 </context>
 <context>
@@ -824,18 +888,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Preferințe</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Preferințe program</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;Despre Flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -844,10 +900,6 @@
 <translation>Configurare utilitar codare</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Alegeți dosarul cu rezultate</translation>
 </message>
@@ -981,33 +1033,93 @@
 <translation>Utilizează &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Șterge modelul curent din istoricul activităților</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Preferințe</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Despre Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Obțineți date din CDDB (baza de date cu CD-uri)</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Alegeți lista de indexare</translation>
+ <translation type="unfinished"/>
 </message>
 <message>
- <source>Add cue or audio file</source>

flacon-4.1.0.tar.gz/translations/flacon_ru.desktop -> flacon-5.0.0.tar.gz/translations/flacon_ru.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_ru.ts -> flacon-5.0.0.tar.gz/translations/flacon_ru.ts Changed

@@ -63,7 +63,7 @@
 </message>
 <message>
 <source>Flacon account on github.com</source>
- <translation>Учетная запись &quot;Flacon&quot; на github.com.</translation>
+ <translation>Учетная запись &quot;Flacon&quot; на github.com</translation>
 </message>
 <message>
 <source>Bug tracker %1</source>
@@ -242,14 +242,6 @@
 <translation>Укажите временную директорию</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Потрековый CUE</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Создавать потрековый CUE</translation>
- </message>
- <message>
 <source> px</source>
 <translation>px</translation>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>Масштабировать если картинка больше чем</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation>Передискретизация</translation>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>44100 Hz</translation>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>48000 Hz</translation>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>96000 Hz</translation>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation>192000 Hz</translation>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation>Максимальный битрейт:</translation>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation>Макс. частота дискретизации:</translation>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation>Потрековый CUE</translation>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation>Создавать потрековый CUE</translation>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation>Как в исходном файле</translation>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>16 бит</translation>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>24 бит</translation>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation>32 бит</translation>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -636,8 +688,18 @@
 <translation>Не задан CUE файл.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Длина аудиофайла меньше чем указано в CUE</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation>Длина аудиофайла меньше чем указано в CUE.</translation>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation>Формат поддерживает максимум %1 бит на отчет, это значение будет использоваться при кодировании.</translation>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation>Формат поддерживает частоты дискретизации до %1, это значение будет использоваться при кодировании.</translation>
 </message>
 </context>
 <context>
@@ -823,18 +885,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Настройки</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Настройки программы</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>О &amp;flacon</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -843,10 +897,6 @@
 <translation>Настроить кодек</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Выбрать директорию назначения</translation>
 </message>
@@ -926,7 +976,7 @@
 </message>
 <message>
 <source>Select directory</source>
- <translation>Выбрать директорию</translation>
+ <translation>Выбор директории</translation>
 </message>
 <message>
 <source>&lt;style type=&quot;text/css&quot;&gt;
@@ -980,34 +1030,94 @@
 <translation>Использовать &quot;%1&quot;</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Удалить текущий шаблон из истории.</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>Удалить диск</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>Удалить диск из проекта</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Настройки</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>О программе Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Стандартная директория для музыки</translation>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Рабочий стол</translation>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation>Там же, где и CUE файл</translation>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation>Удалить текущий шаблон из истории.</translation>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Получить информацию с CDDB</translation>
+ </message>
+ <message>

flacon-5.0.0.tar.gz/translations/flacon_ru_new.ts Added

@@ -0,0 +1,1425 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru">
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <source>About Flacon</source>
+ <translation>О программе Flacon</translation>
+ </message>
+ <message>
+ <source>About</source>
+ <translation>О программе</translation>
+ </message>
+ <message>
+ <source>Author</source>
+ <translation>Автор</translation>
+ </message>
+ <message>
+ <source>Thanks</source>
+ <translation>Благодарности</translation>
+ </message>
+ <message>
+ <source>Translations</source>
+ <translation>Переводы</translation>
+ </message>
+ <message>
+ <source>External programs</source>
+ <translation>Используемые программы</translation>
+ </message>
+ <message>
+ <source>Homepage: %1</source>
+ <translation>Домашняя страница: %1</translation>
+ </message>
+ <message>
+ <source>License: %1</source>
+ <translation>Лицензия: %1</translation>
+ </message>
+ <message>
+ <source>Special thanks to:</source>
+ <translation>Отдельное спасибо:</translation>
+ </message>
+ <message>
+ <source>Flacon uses external programs. Many thanks to their authors!</source>
+ <translation>Flacon использует внешние программы. Огромное спасибо их авторам!</translation>
+ </message>
+ <message>
+ <source>Extracts individual tracks from one big audio file containing the entire album.</source>
+ <translation>Извлекает отдельные треки из большого аудио файла, содержащего весь альбом целиком.</translation>
+ </message>
+ <message>
+ <source>Copyright: %1-%2 %3</source>
+ <translation>Copyright: %1-%2 %3</translation>
+ </message>
+ <message>
+ <source>WavPack support patch</source>
+ <translation>Патч для поддержки WavPack</translation>
+ </message>
+ <message>
+ <source>Packaging, testing</source>
+ <translation>Пакетирование, тестирование</translation>
+ </message>
+ <message>
+ <source>Improvements in the UI</source>
+ <translation>Улучшения в интерфейсе</translation>
+ </message>
+ <message>
+ <source>Flacon account on github.com</source>
+ <translation>Учетная запись &quot;Flacon&quot; на github.com</translation>
+ </message>
+ <message>
+ <source>Bug tracker %1</source>
+ <comment>About dialog, About tab</comment>
+ <translation>Баг-трекер %1</translation>
+ </message>
+ <message>
+ <source>Flacon is translated into many languages thanks to the work of the Flacon translation teams on &lt;a href='%1'&gt;Transifex&lt;/a&gt;.</source>
+ <translation>Flacon переведена на множество языков благодаря работе команды переводчиков на сайте &lt;a href='%1'&gt;Transifex&lt;/a&gt;..</translation>
+ </message>
+</context>
+<context>
+ <name>CodePageComboBox</name>
+ <message>
+ <source>Auto detect</source>
+ <comment>Codepage auto detection</comment>
+ <translation>Автоопределение</translation>
+ </message>
+ <message>
+ <source>Unicode (UTF-8)</source>
+ <translation>Юникод (UTF-8)</translation>
+ </message>
+ <message>
+ <source>Unicode (UTF-16LE)</source>
+ <translation>Юникод (UTF-16LE)</translation>
+ </message>
+ <message>
+ <source>Unicode (UTF-16BE)</source>
+ <translation>Юникод (UTF-16BE)</translation>
+ </message>
+ <message>
+ <source>Cyrillic (Win-1251)</source>
+ <translation>Кириллица (Win-1251)</translation>
+ </message>
+ <message>
+ <source>Cyrillic (CP-866)</source>
+ <translation>Кириллица (CP-866)</translation>
+ </message>
+ <message>
+ <source>Latin-1 (ISO-8859-1)</source>
+ <translation>Latin-1 (ISO-8859-1)</translation>
+ </message>
+ <message>
+ <source>Latin-2 (ISO-8859-2)</source>
+ <translation>Latin-2 (ISO-8859-2)</translation>
+ </message>
+ <message>
+ <source>Latin-3 (ISO-8859-3)</source>
+ <translation>Latin-3 (ISO-8859-3)</translation>
+ </message>
+ <message>
+ <source>Latin-4 (ISO-8859-4)</source>
+ <translation>Latin-4 (ISO-8859-4)</translation>
+ </message>
+ <message>
+ <source>Latin-5 (ISO-8859-5)</source>
+ <translation>Latin-5 (ISO-8859-5)</translation>
+ </message>
+ <message>
+ <source>Latin-6 (ISO-8859-6)</source>
+ <translation>Latin-6 (ISO-8859-6)</translation>
+ </message>
+ <message>
+ <source>Latin-7 (ISO-8859-7)</source>
+ <translation>Latin-7 (ISO-8859-7)</translation>
+ </message>
+ <message>
+ <source>Latin-8 (ISO-8859-8)</source>
+ <translation>Latin-8 (ISO-8859-8)</translation>
+ </message>
+ <message>
+ <source>Latin-9 (ISO-8859-9)</source>
+ <translation>Latin-9 (ISO-8859-9)</translation>
+ </message>
+ <message>
+ <source>Latin-10 (ISO-8859-10)</source>
+ <translation>Latin-10 (ISO-8859-10)</translation>
+ </message>
+ <message>
+ <source>Latin-13 (ISO-8859-13)</source>
+ <translation>Latin-13 (ISO-8859-13)</translation>
+ </message>
+ <message>
+ <source>Latin-14 (ISO-8859-14)</source>
+ <translation>Latin-14 (ISO-8859-14)</translation>
+ </message>
+ <message>
+ <source>Latin-15 (ISO-8859-15)</source>
+ <translation>Latin-15 (ISO-8859-15)</translation>
+ </message>
+ <message>
+ <source>Latin-16 (ISO-8859-16)</source>
+ <translation>Latin-16 (ISO-8859-16)</translation>
+ </message>
+ <message>
+ <source>Windows 1250</source>
+ <translation>Windows 1250</translation>
+ </message>
+ <message>
+ <source>Windows 1252</source>
+ <translation>Windows 1252</translation>
+ </message>
+ <message>
+ <source>Windows 1253</source>
+ <translation>Windows 1253</translation>
+ </message>
+ <message>
+ <source>Windows 1254</source>
+ <translation>Windows 1254</translation>
+ </message>
+ <message>
+ <source>Windows 1255</source>
+ <translation>Windows 1255</translation>
+ </message>
+ <message>
+ <source>Windows 1256</source>
+ <translation>Windows 1256</translation>
+ </message>
+ <message>
+ <source>Windows 1257</source>
+ <translation>Windows 1257</translation>
+ </message>
+ <message>
+ <source>Windows 1258</source>
+ <translation>Windows 1258</translation>
+ </message>
+</context>
+<context>
+ <name>ConfigDialog</name>
+ <message>
+ <source>Preferences</source>

flacon-4.1.0.tar.gz/translations/flacon_sr.desktop -> flacon-5.0.0.tar.gz/translations/flacon_sr.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_sr.ts -> flacon-5.0.0.tar.gz/translations/flacon_sr.ts Changed

@@ -242,14 +242,6 @@
 <translation>Изаберите привремену фасциклу</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>ЦУЕ за сваку нумеру</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Направи ЦУЕ за сваку нумеру</translation>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -605,8 +657,18 @@
 <translation>ЦУЕ фајл није постављен.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Ауди фајл је краћи него што ЦУЕ листа наводи.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -626,7 +688,9 @@
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>Не могу да преименујем фајл:\n
+%1 у %2\n
+%3</translation>
 </message>
 </context>
 <context>
@@ -790,18 +854,10 @@
 <translation>ктрл+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Поставке</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Поставке програма</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;О Флакону</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>ктрл+дел</translation>
 </message>
@@ -810,10 +866,6 @@
 <translation>Подешавање кодера</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Изаберите фасциклу резултата</translation>
 </message>
@@ -929,33 +981,93 @@
 <translation>Користи „%1“</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Избриши текући образац из историјата</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Поставке</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>О Флакону</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Добави податке са ЦДДБ-а</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
 <translation>Изаберите ЦУЕ фајл</translation>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>

flacon-4.1.0.tar.gz/translations/flacon_sr@latin.desktop -> flacon-5.0.0.tar.gz/translations/flacon_sr@latin.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_sr@latin.ts -> flacon-5.0.0.tar.gz/translations/flacon_sr@latin.ts Changed

@@ -242,14 +242,6 @@
 <translation>Izaberite privremenu fasciklu</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>CUE za svaku numeru</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Napravi CUE za svaku numeru</translation>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -605,8 +657,18 @@
 <translation>CUE fajl nije postavljen.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Audi fajl je kraći nego što CUE lista navodi.</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -626,7 +688,9 @@
 <source>I can't rename file:
 %1 to %2
 %3</source>
- <translation type="unfinished"/>
+ <translation>Ne mogu da preimenujem fajl:\n
+%1 u %2\n
+%3</translation>
 </message>
 </context>
 <context>
@@ -790,18 +854,10 @@
 <translation>ktrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>&amp;Postavke</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>Postavke programa</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>&amp;O Flaconu</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>ktrl+del</translation>
 </message>
@@ -810,10 +866,6 @@
 <translation>Podešavanje kodera</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>Izaberite fasciklu rezultata</translation>
 </message>
@@ -929,33 +981,93 @@
 <translation>Koristi „%1“</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>Izbriši tekući obrazac iz istorijata</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Postavke</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>O Flaconu</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>Dobavi podatke sa CDDB-a</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>Izaberite CUE fajl</translation>
+ <translation type="unfinished"/>
 </message>
 <message>
- <source>Add cue or audio file</source>

flacon-4.1.0.tar.gz/translations/flacon_tr.desktop -> flacon-5.0.0.tar.gz/translations/flacon_tr.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_tr.ts -> flacon-5.0.0.tar.gz/translations/flacon_tr.ts Changed

@@ -242,14 +242,6 @@
 <translation>Geçici dizini seç</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"/>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -545,19 +597,19 @@
 </message>
 <message>
 <source>Compression:</source>
- <translation type="unfinished"/>
+ <translation>Sıkıştırma:</translation>
 </message>
 <message>
 <source>ReplayGain</source>
- <translation type="unfinished"/>
+ <translation>Yeniden Oynatma Kazancı</translation>
 </message>
 <message>
 <source>Calculate gain:</source>
- <translation type="unfinished"/>
+ <translation>Hesaplanan kazanç:</translation>
 </message>
 <message>
 <source>Disabled</source>
- <translation type="unfinished"/>
+ <translation>Devre dışı</translation>
 </message>
 </context>
 <context>
@@ -605,7 +657,17 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
 <translation type="unfinished"/>
 </message>
 </context>
@@ -642,7 +704,7 @@
 <message>
 <source>Disabled</source>
 <comment>ReplayGain type combobox</comment>
- <translation type="unfinished"/>
+ <translation>Devre dışı</translation>
 </message>
 <message>
 <source>Per Track</source>
@@ -682,7 +744,7 @@
 <name>MainWindow</name>
 <message>
 <source>Flacon</source>
- <translation type="unfinished"/>
+ <translation>Flacon</translation>
 </message>
 <message>
 <source>Result Files</source>
@@ -786,18 +848,10 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source>Program preferences</source>
 <translation type="unfinished"/>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation type="unfinished"/>
 </message>
@@ -806,10 +860,6 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>...</source>
- <translation type="unfinished"/>
- </message>
- <message>
 <source>Select result directory</source>
 <translation type="unfinished"/>
 </message>
@@ -924,33 +974,93 @@
 <translation type="unfinished"/>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>Ayarlar</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>Flacon Hakkında</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>

flacon-4.1.0.tar.gz/translations/flacon_uk.desktop -> flacon-5.0.0.tar.gz/translations/flacon_uk.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_uk.ts -> flacon-5.0.0.tar.gz/translations/flacon_uk.ts Changed

@@ -242,16 +242,8 @@
 <translation>Вкажіть тимчасову теку</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>Потрековий CUE</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>Створювати потрековий CUE</translation>
- </message>
- <message>
 <source> px</source>
- <translation type="unfinished"/>
+ <translation> px</translation>
 </message>
 <message>
 <source>Temporary directory:</source>
@@ -263,41 +255,101 @@
 </message>
 <message>
 <source>Cover image</source>
- <translation type="unfinished"/>
+ <translation>Обкладинка</translation>
 </message>
 <message>
 <source>Do not copy image</source>
- <translation type="unfinished"/>
+ <translation>Не копіювати</translation>
 </message>
 <message>
 <source>Update</source>
 <extracomment>Preferences tab title </extracomment>
- <translation type="unfinished"/>
+ <translation>Оновлення</translation>
 </message>
 <message>
 <source>Automatically check for updates</source>
- <translation type="unfinished"/>
+ <translation>Перевіряти автоматично</translation>
 </message>
 <message>
 <source>Check now</source>
- <translation type="unfinished"/>
+ <translation>Перевірити</translation>
 </message>
 <message>
 <source>Last check was %1</source>
 <comment>Information about last update</comment>
- <translation type="unfinished"/>
+ <translation>Останнє оновлення було %1</translation>
 </message>
 <message>
 <source>Never checked</source>
 <comment>Information about last update</comment>
- <translation type="unfinished"/>
+ <translation>Ніколи не перевіряли</translation>
 </message>
 <message>
 <source>Keep original image size</source>
- <translation type="unfinished"/>
+ <translation>В початковому розмірі</translation>
 </message>
 <message>
 <source>Resize if image size greater than</source>
+ <translation>Масштабувати якщо картинка більша ніж</translation>
+ </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
 <translation type="unfinished"/>
 </message>
 </context>
@@ -344,7 +396,7 @@
 </message>
 <message>
 <source>FLAC encoding configuration</source>
- <translation type="unfinished"/>
+ <translation>Налаштування конвертування у FLAC</translation>
 </message>
 </context>
 <context>
@@ -447,7 +499,30 @@
 &lt;dd&gt;Using this Average BitRate preset will usually give you higher quality than the Constant BitRate option for a specified bitrate.&lt;/dd&gt;
 </source>
 <extracomment>ererere</extracomment>
- <translation type="unfinished"/>
+ <translation>&lt;dt&gt;VBR medium&lt;/dt&gt;
+&lt;dd&gt;При використанні режиму з середнім змінним бітрейтом, більшість людей не почують спотворень на більшости музики.&lt;/dd&gt;
+
+&lt;dt&gt;VBR standard, VBR standard fast&lt;/dt&gt;
+&lt;dd&gt;При використанні режиму з стандартним змінним бітрейтом, більшість людей не почують спотворень на більшости музики. Ц режим забезпечує досить високу якість.&lt;/dd&gt;
+
+&lt;dt&gt;VBR extreme, VBR extreme fast&lt;/dt&gt;
+&lt;dd&gt;Цей режим дає вищу якість ніж VBR standard. Ви помітите це, якщо у вас дуже добрий слух, або апаратура високого класу.&lt;/dd&gt;
+
+&lt;dt&gt;VBR quality&lt;/dt&gt;
+&lt;dd&gt;В цьому режимі Ві можете самі вказати якість звуку, при цьому використовується змінний бітрейт&lt;/dd&gt;
+
+&lt;dt&gt;fast option&lt;/dt&gt;
+&lt;dd&gt;Рекомендуємо використовувати режими з &quot;fast option&quot;, вони використовують новий, швидкий алгоритм VBR.&lt;/dd&gt;
+
+&lt;dt&gt;CBR insane&lt;/dt&gt;
+Якщо Ви бажаєте отримати щонайбільшу якість звуку, а розмір файлу значення не має, використовуйте цей режим з постійним бітрейтом.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbps&lt;/dt&gt;
+&lt;dd&gt;Використання цього режиму з постійним бітрейтом, дасть хорошу якість при фіксованому бітейті.&lt;/dd&gt;
+
+&lt;dt&gt;ABR kbps&lt;/dt&gt;
+&lt;dd&gt;Зазвичай, цей режим з усередненим бітрейтом дає ліпшу якість ніж режими з постійним бітрейтом.&lt;/dd&gt;
+</translation>
 </message>
 </context>
 <context>
@@ -580,11 +655,11 @@
 <name>CoverDialog</name>
 <message>
 <source>Select cover image</source>
- <translation type="unfinished"/>
+ <translation>Обкладинка диску</translation>
 </message>
 <message>
 <source>Without cover image</source>
- <translation type="unfinished"/>
+ <translation>Без обкладинки</translation>
 </message>
 </context>
 <context>
@@ -600,7 +675,7 @@
 </message>
 <message>
 <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
- <translation type="unfinished"/>
+ <translation>CUE містить декілька дисків. Який диск Ви волієте використовувати?</translation>
 </message>
 </context>
 <context>
@@ -614,8 +689,18 @@
 <translation>Не вказаний CUE файл.</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>Довжина аудіофайлу менша ніж вказано в CUE</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>

flacon-5.0.0.tar.gz/translations/flacon_uz@Latn.ts Added

@@ -0,0 +1,1366 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="uz@Latn" version="2.1">
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <source>About Flacon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>About</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Author</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Thanks</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Translations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>External programs</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Homepage: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>License: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Special thanks to:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Flacon uses external programs. Many thanks to their authors!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Extracts individual tracks from one big audio file containing the entire album.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Copyright: %1-%2 %3</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>WavPack support patch</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Packaging, testing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Improvements in the UI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Flacon account on github.com</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Bug tracker %1</source>
+ <comment>About dialog, About tab</comment>
+ <translation type="unfinished"/>
+ </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>
+<context>
+ <name>CodePageComboBox</name>
+ <message>
+ <source>Auto detect</source>
+ <comment>Codepage auto detection</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Unicode (UTF-8)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Unicode (UTF-16LE)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Unicode (UTF-16BE)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Cyrillic (Win-1251)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Cyrillic (CP-866)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-1 (ISO-8859-1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-2 (ISO-8859-2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-3 (ISO-8859-3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-4 (ISO-8859-4)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-5 (ISO-8859-5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-6 (ISO-8859-6)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-7 (ISO-8859-7)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-8 (ISO-8859-8)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-9 (ISO-8859-9)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-10 (ISO-8859-10)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-13 (ISO-8859-13)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-14 (ISO-8859-14)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-15 (ISO-8859-15)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Latin-16 (ISO-8859-16)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Windows 1250</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Windows 1252</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Windows 1253</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Windows 1254</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Windows 1255</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Windows 1256</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Windows 1257</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Windows 1258</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>ConfigDialog</name>
+ <message>
+ <source>Preferences</source>
+ <translation type="unfinished"/>
+ </message>

flacon-4.1.0.tar.gz/translations/flacon_zh_CN.desktop -> flacon-5.0.0.tar.gz/translations/flacon_zh_CN.desktop Changed

flacon-4.1.0.tar.gz/translations/flacon_zh_CN.ts -> flacon-5.0.0.tar.gz/translations/flacon_zh_CN.ts Changed

@@ -242,14 +242,6 @@
 <translation>选择临时目录</translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation>为每个音轨创建 cue 表</translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation>为每个音轨创建 cue 表</translation>
- </message>
- <message>
 <source> px</source>
 <translation> px</translation>
 </message>
@@ -300,6 +292,66 @@
 <source>Resize if image size greater than</source>
 <translation>调整尺寸，如果图像尺寸大于</translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -614,8 +666,18 @@
 <translation>未设定 Cue 文件。</translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
- <translation>音频文件比预期的 cue 表短。</translation>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"/>
 </message>
 </context>
 <context>
@@ -802,18 +864,10 @@
 <translation>Ctrl+Q</translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation>首选项(&amp;P)</translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation>程序首选项</translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation>关于 Flacon (&amp;A)</translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation>Ctrl+Del</translation>
 </message>
@@ -822,10 +876,6 @@
 <translation>配置编码器</translation>
 </message>
 <message>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation>选择输出目录</translation>
 </message>
@@ -959,34 +1009,94 @@
 <translation>使用“%1”</translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation>从历史中删除当前范例</translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation>移除磁盘</translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation>从项目中移除磁盘</translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation>首选项</translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation>关于 Flacon</translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation>从 CDDB 撷取数据</translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
- <translation>选择 cue 文件</translation>
+ <translation>选择 CUE 文件</translation>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>
 <comment>OpenFile dialog title</comment>
- <translation>添加 cue 或音频文件</translation>
+ <translation>添加 CUE 或音频文件</translation>
 </message>
 <message>
- <source>Delete current pattern from history</source>
- <translation>从历史中删除当前范例</translation>
+ <source>Edit all tags…</source>
+ <comment>Button text</comment>
+ <translation type="unfinished"/>

flacon-5.0.0.tar.gz/translations/flacon_zh_TW.desktop Added

flacon-4.1.0.tar.gz/translations/flacon_zh_TW.ts -> flacon-5.0.0.tar.gz/translations/flacon_zh_TW.ts Changed

@@ -3,19 +3,19 @@
 <name>AboutDialog</name>
 <message>
 <source>About Flacon</source>
- <translation type="unfinished"/>
+ <translation>關於 Flacon</translation>
 </message>
 <message>
 <source>About</source>
- <translation type="unfinished"/>
+ <translation>關於</translation>
 </message>
 <message>
 <source>Author</source>
- <translation type="unfinished"/>
+ <translation>作者</translation>
 </message>
 <message>
 <source>Thanks</source>
- <translation type="unfinished"/>
+ <translation>鳴謝</translation>
 </message>
 <message>
 <source>Translations</source>
@@ -23,7 +23,7 @@
 </message>
 <message>
 <source>External programs</source>
- <translation type="unfinished"/>
+ <translation>外掛程式</translation>
 </message>
 <message>
 <source>Homepage: %1</source>
@@ -43,7 +43,7 @@
 </message>
 <message>
 <source>Extracts individual tracks from one big audio file containing the entire album.</source>
- <translation type="unfinished"/>
+ <translation>從包含整個專輯的單個大聲訊檔案中擷取單個曲目。</translation>
 </message>
 <message>
 <source>Copyright: %1-%2 %3</source>
@@ -195,19 +195,19 @@
 <name>ConfigDialog</name>
 <message>
 <source>Preferences</source>
- <translation type="unfinished"/>
+ <translation>個人偏好</translation>
 </message>
 <message>
 <source>General configuration</source>
- <translation type="unfinished"/>
+ <translation>通用設定</translation>
 </message>
 <message>
 <source>Thread count:</source>
- <translation type="unfinished"/>
+ <translation>執行緒計數：</translation>
 </message>
 <message>
 <source>The number of threads in the conversion process.</source>
- <translation type="unfinished"/>
+ <translation>轉換執行緒數。</translation>
 </message>
 <message>
 <source>First track pregap:</source>
@@ -215,11 +215,11 @@
 </message>
 <message>
 <source>Rescan</source>
- <translation type="unfinished"/>
+ <translation>重新掃描</translation>
 </message>
 <message>
 <source>Full path of the external applications</source>
- <translation type="unfinished"/>
+ <translation>外掛程式的完整路徑</translation>
 </message>
 <message>
 <source>Extract to separate file</source>
@@ -231,23 +231,15 @@
 </message>
 <message>
 <source>General</source>
- <translation type="unfinished"/>
+ <translation>常規</translation>
 </message>
 <message>
 <source>Programs</source>
- <translation type="unfinished"/>
+ <translation>程式</translation>
 </message>
 <message>
 <source>Select temporary directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Per track cue sheet</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation type="unfinished"/>
+ <translation>選取臨時目錄</translation>
 </message>
 <message>
 <source> px</source>
@@ -255,7 +247,7 @@
 </message>
 <message>
 <source>Temporary directory:</source>
- <translation type="unfinished"/>
+ <translation>臨時目錄：</translation>
 </message>
 <message>
 <source>Default codepage:</source>
@@ -300,47 +292,107 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"/>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"/>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
 <message>
 <source>AAC encoding configuration</source>
- <translation type="unfinished"/>
+ <translation>AAC 編碼配置</translation>
 </message>
 <message>
 <source>Use quality setting (recommended)</source>
- <translation type="unfinished"/>
+ <translation>使用動態編碼型態（建議）</translation>
 </message>
 <message>
 <source>Use bitrate</source>
- <translation type="unfinished"/>
+ <translation>使用固定碼率型態</translation>
 </message>
 <message>
 <source>Bitrate:</source>

flacon-4.1.0.tar.gz/translations/src.flacon.ts -> flacon-5.0.0.tar.gz/translations/src.flacon.ts Changed

@@ -244,14 +244,6 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Per track cue sheet</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Create per track cue sheet</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
 <source> px</source>
 <translation type="unfinished"></translation>
 </message>
@@ -302,6 +294,66 @@
 <source>Resize if image size greater than</source>
 <translation type="unfinished"></translation>
 </message>
+ <message>
+ <source>Resampling</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>44100 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>48000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>96000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>192000 Hz</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Maximum bit depth:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Maximum sample rate:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Per track CUE sheet</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Create per track CUE sheet</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Same as source</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>16-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>24-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>32-bit</source>
+ <comment>Item in combobox</comment>
+ <translation type="unfinished"></translation>
+ </message>
 </context>
 <context>
 <name>ConfigPage_Aac</name>
@@ -607,7 +659,17 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Audio file shorter than expected from cue sheet.</source>
+ <source>Audio file shorter than expected from CUE sheet.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>A maximum of %1-bit per sample is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>A maximum sample rate of %1 is supported by this format. This value will be used for encoding.</source>
+ <comment>Warning message</comment>
 <translation type="unfinished"></translation>
 </message>
 </context>
@@ -788,18 +850,10 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <source>&amp;Preferences</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
 <source>Program preferences</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <source>&amp;About Flacon</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
 <source>Ctrl+Del</source>
 <translation type="unfinished"></translation>
 </message>
@@ -808,10 +862,6 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <source>...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
 <source>Select result directory</source>
 <translation type="unfinished"></translation>
 </message>
@@ -926,33 +976,93 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Select cue file</source>
+ <source>Delete current pattern from history</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Remove disk</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Remove disk from project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Preferences</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>About Flacon</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Standard music location</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Desktop</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Same directory as CUE file</source>
+ <comment>Menu item for output direcory button</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Remove current directory from history</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Get data from CDDB</source>
+ <comment>context menu</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Select CUE file</source>
 <comment>OpenFile dialog title</comment>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Add cue or audio file</source>
+ <source>Add CUE or audio file</source>
 <comment>OpenFile dialog title</comment>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Delete current pattern from history</source>
+ <source>Edit all tags…</source>
+ <comment>Button text</comment>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Add disk</source>
+ <source>Add disk…</source>
 <translation type="unfinished"></translation>

flacon-5.0.0.tar.gz/translations/translators_he.info Added

flacon-4.1.0.tar.gz/translations/translators_hu.info -> flacon-5.0.0.tar.gz/translations/translators_hu.info Changed

flacon-5.0.0.tar.gz/translations/translators_id.info Added

flacon-4.1.0.tar.gz/types.cpp -> flacon-5.0.0.tar.gz/types.cpp Changed

@@ -26,7 +26,7 @@
 
 #include "types.h"
 #include <QVector>
-
+#include <QTextStream>
 
 /************************************************
 *
@@ -162,3 +162,173 @@
 
 return res;
 }
+
+
+/************************************************
+
+ ************************************************/
+CueIndex::CueIndex(const QString &str):
+ mNull(true),
+ mCdValue(0),
+ mHiValue(0)
+{
+ if (!str.isEmpty())
+ mNull = !parse(str);
+}
+
+
+/************************************************
+
+ ************************************************/
+QString CueIndex::toString(bool cdQuality) const
+{
+ if (cdQuality)
+ {
+ int min = mCdValue / (60 * 75);
+ int sec = (mCdValue - min * 60 * 75) / 75;
+ int frm = mCdValue - (min * 60 + sec) * 75;
+
+ return QString("%1:%2:%3")
+ .arg(min, 2, 10, QChar('0'))
+ .arg(sec, 2, 10, QChar('0'))
+ .arg(frm, 2, 10, QChar('0'));
+ }
+ else
+ {
+ int min = mHiValue / (60 * 1000);
+ int sec = (mHiValue - min * 60 * 1000) / 1000;
+ int msec = mHiValue - (min * 60 + sec) * 1000;
+
+ return QString("%1:%2.%3")
+ .arg(min, 2, 10, QChar('0'))
+ .arg(sec, 2, 10, QChar('0'))
+ .arg(msec, 3, 10, QChar('0'));
+ }
+
+}
+
+
+/************************************************
+
+ ************************************************/
+CueIndex CueIndex::operator -(const CueIndex &other) const
+{
+ CueIndex res;
+ res.mCdValue = this->mCdValue - other.mCdValue;
+ res.mHiValue = this->mHiValue - other.mHiValue;
+ res.mNull = false;
+ return res;
+}
+
+
+/************************************************
+
+ ************************************************/
+bool CueIndex::operator ==(const CueIndex &other) const
+{
+ return this->mHiValue == other.mHiValue;
+}
+
+
+/************************************************
+
+ ************************************************/
+bool CueIndex::operator !=(const CueIndex &other) const
+{
+ return this->mHiValue != other.mHiValue;
+}
+
+
+/************************************************
+
+ ************************************************/
+bool CueIndex::parse(const QString &str)
+{
+ QStringList sl = str.split(QRegExp("\\D"), QString::KeepEmptyParts);
+
+ if (sl.length()<3)
+ return false;
+
+ bool ok;
+ int min = sl[0].toInt(&ok);
+ if (!ok)
+ return false;
+
+ int sec = sl[1].toInt(&ok);
+ if (!ok)
+ return false;
+
+ int frm = sl[2].leftJustified(2, '0').toInt(&ok);
+ if (!ok)
+ return false;
+
+ int msec = sl[2].leftJustified(3, '0').toInt(&ok);
+ if (!ok)
+ return false;
+
+ mCdValue = (min * 60 + sec) * 75 + frm;
+ mHiValue = (min * 60 + sec) * 1000 + msec;
+ return true;
+}
+
+
+/************************************************
+
+ ************************************************/
+QByteArray leftPart(const QByteArray &line, const QChar separator)
+{
+ int n = line.indexOf(separator);
+ if (n > -1)
+ return line.left(n);
+ else
+ return line;
+}
+
+
+/************************************************
+
+ ************************************************/
+QByteArray rightPart(const QByteArray &line, const QChar separator)
+{
+ int n = line.indexOf(separator);
+ if (n > -1)
+ return line.right(line.length() - n - 1);
+ else
+ return QByteArray();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void initTypes()
+{
+ qRegisterMetaType<TrackState>("TrackState");
+}
+
+
+Messages::Handler *Messages::mHandler = nullptr;
+
+/************************************************
+ *
+ ************************************************/
+void Messages::error(const QString &message)
+{
+ QString msg(message);
+ msg.replace(" ", " ", Qt::CaseInsensitive);
+ msg.remove(QRegExp("<[^>]*>"));
+ msg.replace("\\n", "\n");
+ QTextStream(stderr) << msg.toLocal8Bit() << endl;
+
+ if (mHandler)
+ mHandler->showErrorMessage(message);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void Messages::setHandler(Messages::Handler *handler)
+{
+ mHandler = handler;
+}

flacon-4.1.0.tar.gz/types.h -> flacon-5.0.0.tar.gz/types.h Changed

@@ -29,6 +29,12 @@
 #include <QString>
 #include <QIcon>
 
+#define CODEC_AUTODETECT "AUTODETECT"
+
+typedef quint16 DiskNum;
+typedef quint16 TrackNum;
+typedef uint Duration;
+
 enum class PreGapType
 {
 Skip,
@@ -61,8 +67,124 @@
 QString coverModeToString(CoverMode mode);
 CoverMode strToCoverMode(const QString &str);
 
+typedef quint16 DiskNum;
+typedef quint16 TrackNum;
 
 unsigned int levenshteinDistance(const QString &s1, const QString & s2);
 QIcon loadIcon(const QString &iconName, bool loadDisable = true);
 
+class FlaconError: public std::exception
+{
+public:
+ explicit FlaconError(const QString &msg):
+ std::exception(),
+ mMsg(msg)
+ {
+ }
+
+ const char* what() const noexcept
+ {
+ return mMsg.toLocal8Bit().constData();
+ }
+
+ QString message() const noexcept
+ {
+ return mMsg;
+ }
+
+protected:
+ QString mMsg;
+};
+
+
+class CueIndex
+{
+public:
+ explicit CueIndex(const QString &str = "");
+
+ bool isNull() const { return mNull; }
+ QString toString(bool cdQuality = true) const;
+
+ CueIndex operator-(const CueIndex &other) const;
+ bool operator==(const CueIndex &other) const;
+ bool operator!=(const CueIndex &other) const;
+
+ uint milliseconds() const { return mHiValue; }
+ uint frames() const { return mCdValue; }
+
+private:
+ bool mNull;
+ int mCdValue;
+ int mHiValue;
+
+ bool parse(const QString &str);
+};
+
+typedef CueIndex CueTime;
+
+
+enum class TrackState
+{
+ NotRunning = 0,
+ Canceled = 1,
+ Error = 2,
+ Aborted = 3,
+ OK = 4,
+ Splitting = 5,
+ Encoding = 6,
+ Queued = 7,
+ WaitGain = 8,
+ CalcGain = 9,
+ WriteGain = 10
+};
+
+Q_DECLARE_METATYPE(TrackState)
+
+
+enum class BitsPerSample
+{
+ AsSourcee = 0,
+ Bit_16 = 16,
+ Bit_24 = 24,
+ Bit_32 = 32
+};
+Q_DECLARE_METATYPE(BitsPerSample)
+
+
+enum class SampleRate
+{
+ AsSource = 0,
+ Hz_44100 = 44100,
+ Hz_48000 = 48000,
+ Hz_96000 = 96000,
+ Hz_192000 = 192000,
+};
+Q_DECLARE_METATYPE(SampleRate)
+
+typedef quint8 Percent;
+typedef quint64 TrackId;
+
+QByteArray leftPart(const QByteArray &line, const QChar separator);
+QByteArray rightPart(const QByteArray &line, const QChar separator);
+void initTypes();
+
+
+
+class Messages
+{
+public:
+ static void error(const QString &message);
+
+ class Handler
+ {
+ public:
+ virtual void showErrorMessage(const QString &message) = 0;
+ };
+
+ static void setHandler(Handler *handler);
+
+private:
+ static Handler *mHandler;
+};
+
 #endif // TYPES_H