Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Some code clean-up in Model_AudioFile class.

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-02-08 17:24:54 +01:00
parent a07cec8342
commit c574a5e550
4 changed files with 124 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
etc/Translation/Blank.ts
View File

@ -389,56 +389,56 @@
<context> <context>
<name>AudioFileModel</name> <name>AudioFileModel</name>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="251"/> <location filename="../../src/Model_AudioFile.cpp" line="279"/>
<location filename="../../src/Model_AudioFile.cpp" line="307"/> <location filename="../../src/Model_AudioFile.cpp" line="335"/>
<source>Profile</source> <source>Profile</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="268"/> <location filename="../../src/Model_AudioFile.cpp" line="296"/>
<source>Channels</source> <source>Channels</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="273"/> <location filename="../../src/Model_AudioFile.cpp" line="301"/>
<source>Samplerate</source> <source>Samplerate</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="280"/> <location filename="../../src/Model_AudioFile.cpp" line="308"/>
<location filename="../../src/Model_AudioFile.cpp" line="284"/> <location filename="../../src/Model_AudioFile.cpp" line="312"/>
<source>Bitdepth</source> <source>Bitdepth</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="302"/> <location filename="../../src/Model_AudioFile.cpp" line="330"/>
<source>Type</source> <source>Type</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="311"/> <location filename="../../src/Model_AudioFile.cpp" line="339"/>
<source>Version</source> <source>Version</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="318"/> <location filename="../../src/Model_AudioFile.cpp" line="346"/>
<location filename="../../src/Model_AudioFile.cpp" line="321"/> <location filename="../../src/Model_AudioFile.cpp" line="349"/>
<location filename="../../src/Model_AudioFile.cpp" line="324"/> <location filename="../../src/Model_AudioFile.cpp" line="352"/>
<source>Bitrate</source> <source>Bitrate</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="318"/> <location filename="../../src/Model_AudioFile.cpp" line="346"/>
<source>Constant</source> <source>Constant</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="321"/> <location filename="../../src/Model_AudioFile.cpp" line="349"/>
<source>Variable</source> <source>Variable</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="330"/> <location filename="../../src/Model_AudioFile.cpp" line="358"/>
<source>Encoder</source> <source>Encoder</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

28
etc/Translation/LameXP_PL.ts
View File

@ -389,56 +389,56 @@
<context> <context>
<name>AudioFileModel</name> <name>AudioFileModel</name>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="251"/> <location filename="../../src/Model_AudioFile.cpp" line="279"/>
<location filename="../../src/Model_AudioFile.cpp" line="307"/> <location filename="../../src/Model_AudioFile.cpp" line="335"/>
<source>Profile</source> <source>Profile</source>
<translation type="unfinished">Profil</translation> <translation type="unfinished">Profil</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="268"/> <location filename="../../src/Model_AudioFile.cpp" line="296"/>
<source>Channels</source> <source>Channels</source>
<translation type="unfinished">Kanały</translation> <translation type="unfinished">Kanały</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="273"/> <location filename="../../src/Model_AudioFile.cpp" line="301"/>
<source>Samplerate</source> <source>Samplerate</source>
<translation type="unfinished">Częstotliwość</translation> <translation type="unfinished">Częstotliwość</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="280"/> <location filename="../../src/Model_AudioFile.cpp" line="308"/>
<location filename="../../src/Model_AudioFile.cpp" line="284"/> <location filename="../../src/Model_AudioFile.cpp" line="312"/>
<source>Bitdepth</source> <source>Bitdepth</source>
<translation type="unfinished">Głębia bitów</translation> <translation type="unfinished">Głębia bitów</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="302"/> <location filename="../../src/Model_AudioFile.cpp" line="330"/>
<source>Type</source> <source>Type</source>
<translation type="unfinished">Typ</translation> <translation type="unfinished">Typ</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="311"/> <location filename="../../src/Model_AudioFile.cpp" line="339"/>
<source>Version</source> <source>Version</source>
<translation type="unfinished">Wersja</translation> <translation type="unfinished">Wersja</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="318"/> <location filename="../../src/Model_AudioFile.cpp" line="346"/>
<location filename="../../src/Model_AudioFile.cpp" line="321"/> <location filename="../../src/Model_AudioFile.cpp" line="349"/>
<location filename="../../src/Model_AudioFile.cpp" line="324"/> <location filename="../../src/Model_AudioFile.cpp" line="352"/>
<source>Bitrate</source> <source>Bitrate</source>
<translation type="unfinished">Przepływność bitów</translation> <translation type="unfinished">Przepływność bitów</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="318"/> <location filename="../../src/Model_AudioFile.cpp" line="346"/>
<source>Constant</source> <source>Constant</source>
<translation type="unfinished">Stały</translation> <translation type="unfinished">Stały</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="321"/> <location filename="../../src/Model_AudioFile.cpp" line="349"/>
<source>Variable</source> <source>Variable</source>
<translation type="unfinished">Zmienny</translation> <translation type="unfinished">Zmienny</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="330"/> <location filename="../../src/Model_AudioFile.cpp" line="358"/>
<source>Encoder</source> <source>Encoder</source>
<translation type="unfinished">Koder</translation> <translation type="unfinished">Koder</translation>
</message> </message>

28
etc/Translation/LameXP_SV.ts
View File

@ -389,56 +389,56 @@
<context> <context>
<name>AudioFileModel</name> <name>AudioFileModel</name>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="251"/> <location filename="../../src/Model_AudioFile.cpp" line="279"/>
<location filename="../../src/Model_AudioFile.cpp" line="307"/> <location filename="../../src/Model_AudioFile.cpp" line="335"/>
<source>Profile</source> <source>Profile</source>
<translation>Profil</translation> <translation>Profil</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="268"/> <location filename="../../src/Model_AudioFile.cpp" line="296"/>
<source>Channels</source> <source>Channels</source>
<translation>Kanaler</translation> <translation>Kanaler</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="273"/> <location filename="../../src/Model_AudioFile.cpp" line="301"/>
<source>Samplerate</source> <source>Samplerate</source>
<translation>Samplingsfrekvens</translation> <translation>Samplingsfrekvens</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="280"/> <location filename="../../src/Model_AudioFile.cpp" line="308"/>
<location filename="../../src/Model_AudioFile.cpp" line="284"/> <location filename="../../src/Model_AudioFile.cpp" line="312"/>
<source>Bitdepth</source> <source>Bitdepth</source>
<translation>Bitdjup</translation> <translation>Bitdjup</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="302"/> <location filename="../../src/Model_AudioFile.cpp" line="330"/>
<source>Type</source> <source>Type</source>
<translation>Typ</translation> <translation>Typ</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="311"/> <location filename="../../src/Model_AudioFile.cpp" line="339"/>
<source>Version</source> <source>Version</source>
<translation>Version</translation> <translation>Version</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="318"/> <location filename="../../src/Model_AudioFile.cpp" line="346"/>
<location filename="../../src/Model_AudioFile.cpp" line="321"/> <location filename="../../src/Model_AudioFile.cpp" line="349"/>
<location filename="../../src/Model_AudioFile.cpp" line="324"/> <location filename="../../src/Model_AudioFile.cpp" line="352"/>
<source>Bitrate</source> <source>Bitrate</source>
<translation>Bithastighet</translation> <translation>Bithastighet</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="318"/> <location filename="../../src/Model_AudioFile.cpp" line="346"/>
<source>Constant</source> <source>Constant</source>
<translation>Konstant</translation> <translation>Konstant</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="321"/> <location filename="../../src/Model_AudioFile.cpp" line="349"/>
<source>Variable</source> <source>Variable</source>
<translation>Variabel</translation> <translation>Variabel</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_AudioFile.cpp" line="330"/> <location filename="../../src/Model_AudioFile.cpp" line="358"/>
<source>Encoder</source> <source>Encoder</source>
<translatorcomment>Kodare</translatorcomment> <translatorcomment>Kodare</translatorcomment>
<translation></translation> <translation></translation>

136
src/Model_AudioFile.cpp
View File

@ -45,6 +45,32 @@ while(0)
} \ } \
while(0) while(0)
//if((!(OTHER.NAME.isEmpty())) && ((FORCE) || (this.NAME.isEmpty()))) /*this.NAME = OTHER.NAME;*/ \
#define UPDATE_STR(OTHER, FORCE, NAME) do \
{ \
if(!(((OTHER).NAME).isEmpty())) \
{ \
if((FORCE) || ((this->NAME).isEmpty())) (this->NAME) = ((OTHER).NAME); \
} \
} \
while(0)
#define UPDATE_INT(OTHER, FORCE, NAME) do \
{ \
if(((OTHER).NAME) > 0) \
{ \
if((FORCE) || ((this->NAME) == 0)) (this->NAME) = ((OTHER).NAME); \
} \
} \
while(0)
#define ASSIGN_VAL(OTHER, NAME) do \
{ \
(this->NAME) = ((OTHER).NAME); \
} \
while(0)
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Audio File - Meta Info // Audio File - Meta Info
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -56,40 +82,42 @@ AudioFileModel_MetaInfo::AudioFileModel_MetaInfo(void)
AudioFileModel_MetaInfo::AudioFileModel_MetaInfo(const AudioFileModel_MetaInfo &model) AudioFileModel_MetaInfo::AudioFileModel_MetaInfo(const AudioFileModel_MetaInfo &model)
{ {
m_titel = model.m_titel; ASSIGN_VAL(model, m_titel);
m_artist = model.m_artist; ASSIGN_VAL(model, m_artist);
m_album = model.m_album; ASSIGN_VAL(model, m_album);
m_genre = model.m_genre; ASSIGN_VAL(model, m_genre);
m_comment = model.m_comment; ASSIGN_VAL(model, m_comment);
m_cover = model.m_cover; ASSIGN_VAL(model, m_cover);
m_year = model.m_year; ASSIGN_VAL(model, m_year);
m_position = model.m_position; ASSIGN_VAL(model, m_position);
} }
AudioFileModel_MetaInfo &AudioFileModel_MetaInfo::operator=(const AudioFileModel_MetaInfo &model) AudioFileModel_MetaInfo &AudioFileModel_MetaInfo::operator=(const AudioFileModel_MetaInfo &model)
{ {
m_titel = model.m_titel; ASSIGN_VAL(model, m_titel);
m_artist = model.m_artist; ASSIGN_VAL(model, m_artist);
m_album = model.m_album; ASSIGN_VAL(model, m_album);
m_genre = model.m_genre; ASSIGN_VAL(model, m_genre);
m_comment = model.m_comment; ASSIGN_VAL(model, m_comment);
m_cover = model.m_cover; ASSIGN_VAL(model, m_cover);
m_year = model.m_year; ASSIGN_VAL(model, m_year);
m_position = model.m_position; ASSIGN_VAL(model, m_position);
return (*this); return (*this);
} }
#define IS_EMPTY(X) ((X).isEmpty() ? "YES" : "NO")
void AudioFileModel_MetaInfo::update(const AudioFileModel_MetaInfo &model, const bool replace) void AudioFileModel_MetaInfo::update(const AudioFileModel_MetaInfo &model, const bool replace)
{ {
if((!model.m_titel.isEmpty()) && (replace || m_titel.isEmpty())) m_titel = model.m_titel; UPDATE_STR(model, replace, m_titel);
if((!model.m_artist.isEmpty()) && (replace || m_artist.isEmpty())) m_artist = model.m_artist; UPDATE_STR(model, replace, m_artist);
if((!model.m_album.isEmpty()) && (replace || m_album.isEmpty())) m_album = model.m_album; UPDATE_STR(model, replace, m_album);
if((!model.m_genre.isEmpty()) && (replace || m_genre.isEmpty())) m_genre = model.m_genre; UPDATE_STR(model, replace, m_genre);
if((!model.m_comment.isEmpty()) && (replace || m_comment.isEmpty())) m_comment = model.m_comment; UPDATE_STR(model, replace, m_comment);
if((!model.m_cover.isEmpty()) && (replace || m_cover.isEmpty())) m_cover = model.m_cover; UPDATE_STR(model, replace, m_cover);
if((model.m_year > 0) && (replace || (m_year == 0))) m_year = model.m_year; UPDATE_INT(model, replace, m_year);
if((model.m_position > 0) && (replace || (m_position == 0))) m_position = model.m_position; UPDATE_INT(model, replace, m_position);
} }
AudioFileModel_MetaInfo::~AudioFileModel_MetaInfo(void) AudioFileModel_MetaInfo::~AudioFileModel_MetaInfo(void)
@ -132,34 +160,34 @@ AudioFileModel_TechInfo::AudioFileModel_TechInfo(void)
AudioFileModel_TechInfo::AudioFileModel_TechInfo(const AudioFileModel_TechInfo &model) AudioFileModel_TechInfo::AudioFileModel_TechInfo(const AudioFileModel_TechInfo &model)
{ {
m_containerType = model.m_containerType; ASSIGN_VAL(model, m_containerType);
m_containerProfile = model.m_containerProfile; ASSIGN_VAL(model, m_containerProfile);
m_audioType = model.m_audioType; ASSIGN_VAL(model, m_audioType);
m_audioProfile = model.m_audioProfile; ASSIGN_VAL(model, m_audioProfile);
m_audioVersion = model.m_audioVersion; ASSIGN_VAL(model, m_audioVersion);
m_audioEncodeLib = model.m_audioEncodeLib; ASSIGN_VAL(model, m_audioEncodeLib);
m_audioSamplerate = model.m_audioSamplerate; ASSIGN_VAL(model, m_audioSamplerate);
m_audioChannels = model.m_audioChannels; ASSIGN_VAL(model, m_audioChannels);
m_audioBitdepth = model.m_audioBitdepth; ASSIGN_VAL(model, m_audioBitdepth);
m_audioBitrate = model.m_audioBitrate; ASSIGN_VAL(model, m_audioBitrate);
m_audioBitrateMode = model.m_audioBitrateMode; ASSIGN_VAL(model, m_audioBitrateMode);
m_duration = model.m_duration; ASSIGN_VAL(model, m_duration);
} }
AudioFileModel_TechInfo &AudioFileModel_TechInfo::operator=(const AudioFileModel_TechInfo &model) AudioFileModel_TechInfo &AudioFileModel_TechInfo::operator=(const AudioFileModel_TechInfo &model)
{ {
m_containerType = model.m_containerType; ASSIGN_VAL(model, m_containerType);
m_containerProfile = model.m_containerProfile; ASSIGN_VAL(model, m_containerProfile);
m_audioType = model.m_audioType; ASSIGN_VAL(model, m_audioType);
m_audioProfile = model.m_audioProfile; ASSIGN_VAL(model, m_audioProfile);
m_audioVersion = model.m_audioVersion; ASSIGN_VAL(model, m_audioVersion);
m_audioEncodeLib = model.m_audioEncodeLib; ASSIGN_VAL(model, m_audioEncodeLib);
m_audioSamplerate = model.m_audioSamplerate; ASSIGN_VAL(model, m_audioSamplerate);
m_audioChannels = model.m_audioChannels; ASSIGN_VAL(model, m_audioChannels);
m_audioBitdepth = model.m_audioBitdepth; ASSIGN_VAL(model, m_audioBitdepth);
m_audioBitrate = model.m_audioBitrate; ASSIGN_VAL(model, m_audioBitrate);
m_audioBitrateMode = model.m_audioBitrateMode; ASSIGN_VAL(model, m_audioBitrateMode);
m_duration = model.m_duration; ASSIGN_VAL(model, m_duration);
return (*this); return (*this);
} }
@ -199,16 +227,16 @@ AudioFileModel::AudioFileModel(const QString &path)
AudioFileModel::AudioFileModel(const AudioFileModel &model) AudioFileModel::AudioFileModel(const AudioFileModel &model)
{ {
m_filePath = model.m_filePath; ASSIGN_VAL(model, m_filePath);
m_metaInfo = model.m_metaInfo; ASSIGN_VAL(model, m_metaInfo);
m_techInfo = model.m_techInfo; ASSIGN_VAL(model, m_techInfo);
} }
AudioFileModel &AudioFileModel::operator=(const AudioFileModel &model) AudioFileModel &AudioFileModel::operator=(const AudioFileModel &model)
{ {
m_filePath = model.m_filePath; ASSIGN_VAL(model, m_filePath);
m_metaInfo = model.m_metaInfo; ASSIGN_VAL(model, m_metaInfo);
m_techInfo = model.m_techInfo; ASSIGN_VAL(model, m_techInfo);
return (*this); return (*this);
} }