Bump version.

[lamexp/LameXP.git] / src / Global.h

diff --git a/src/Global.h b/src/Global.h
index 8c75723..93c5445 100644 (file)
--- a/src/Global.h
+++ b/src/Global.h
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2020 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// it under the terms of the GNU GENERAL PUBLIC LICENSE as published by
 // the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version, but always including the *additional*
-// restrictions defined in the "License.txt" file.
+// (at your option) any later version; always including the non-optional
+// LAMEXP GNU GENERAL PUBLIC LICENSE ADDENDUM. See "License.txt" file!
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,7 +45,7 @@ class LockedFile;
  */
 void           lamexp_tools_register(const QString &toolName, LockedFile *const file, const quint32 &version, const QString &tag = QString());
 bool           lamexp_tools_check   (const QString &toolName);
-const QString& lamexp_tools_lookup  (const QString &toolName);
+const QString  lamexp_tools_lookup  (const QString &toolName);
 const quint32& lamexp_tools_version (const QString &toolName, QString *const tagOut = NULL);
 
 /*
@@ -61,8 +61,8 @@ bool         lamexp_version_demo     (void);
 const QDate& lamexp_version_expires  (void);
 unsigned int lamexp_toolver_neroaac  (void);
 unsigned int lamexp_toolver_fhgaacenc(void);
+unsigned int lamexp_toolver_fdkaacenc(void);
 unsigned int lamexp_toolver_qaacenc  (void);
-unsigned int lamexp_toolver_coreaudio(void);
 
 /*
  * URL getters
@@ -73,6 +73,11 @@ const char *lamexp_support_url(void);
 const char *lamexp_tracker_url(void);
 
 /*
+* Resources
+*/
+void lamexp_initialize_resources(void);
+
+/*
  * Misc Functions
  */
 const QIcon&  lamexp_app_icon(void);
@@ -82,4 +87,5 @@ const QString lamexp_version2string(const QString &pattern, unsigned int version
 // HELPER MACROS
 ///////////////////////////////////////////////////////////////////////////////
 
-#define NOBR(STR) (QString("<nobr>%1</nobr>").arg((STR)).replace("-", "&minus;"))
+#define L1S(STR) (QLatin1String((STR)))
+#define NOBREAK(STR) (QString("<div style='white-space:pre'>%1</div>").arg((STR)))