Skip to content

Commit

Permalink
- Updated copyright headers into the New Year. (bis)
Browse files Browse the repository at this point in the history
  • Loading branch information
rncbc committed Jan 2, 2024
1 parent 8e886c1 commit 5b3fd2e
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 49 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,7 @@ macro (SHOW_OPTION text value)
endif ()
endmacro ()


message ("\n ${PACKAGE_NAME} ${PACKAGE_VERSION} (Qt ${QT_VERSION})")
message ("\n ${PROJECT_NAME} ${PROJECT_VERSION} (Qt ${QT_VERSION})")
message ("\n Build target . . . . . . . . . . . . . . . . . . .: ${CONFIG_BUILD_TYPE}\n")
show_option (" JACK stand-alone build . . . . . . . . . . . . . ." CONFIG_JACK)
show_option (" JACK session support . . . . . . . . . . . . . . ." CONFIG_JACK_SESSION)
Expand Down
2 changes: 1 addition & 1 deletion src/synthv1_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ synthv1_config *synthv1_config::getInstance (void)

// Constructor.
synthv1_config::synthv1_config (void)
: QSettings(SYNTHV1_DOMAIN, SYNTHV1_TITLE)
: QSettings(PROJECT_DOMAIN, PROJECT_NAME)
{
g_pSettings = this;

Expand Down
12 changes: 6 additions & 6 deletions src/synthv1_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

#include "config.h"

#define SYNTHV1_TITLE PROJECT_NAME
#ifndef PROJECT_COPYRIGHT
#define PROJECT_COPYRIGHT "Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved."
#endif

#define SYNTHV1_SUBTITLE PROJECT_DESCRIPTION
#define SYNTHV1_WEBSITE PROJECT_HOMEPAGE_URL

#define SYNTHV1_COPYRIGHT "Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved."
#define SYNTHV1_DOMAIN "rncbc.org"
#ifndef PROJECT_DOMAIN
#define PROJECT_DOMAIN "rncbc.org"
#endif


//-------------------------------------------------------------------------
Expand Down
40 changes: 20 additions & 20 deletions src/synthv1_jack.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// synthv1_jack.cpp
//
/****************************************************************************
Copyright (C) 2012-2023, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -602,7 +602,7 @@ void synthv1_jack::sessionEvent ( void *pvSessionArg )
= QString::fromUtf8(pJackSessionEvent->session_dir);
const QString sSessionName
= QFileInfo(QFileInfo(sSessionDir).canonicalPath()).completeBaseName();
const QString sSessionFile = sSessionName + '.' + SYNTHV1_TITLE;
const QString sSessionFile = sSessionName + '.' + PROJECT_NAME;

QStringList args;
args << QCoreApplication::applicationFilePath();
Expand Down Expand Up @@ -727,7 +727,7 @@ static void synthv1_sigterm_handler ( int /*signo*/ )
// Constructor.
synthv1_jack_application::synthv1_jack_application ( int& argc, char **argv )
: QObject(nullptr), m_pApp(nullptr), m_bGui(true),
m_sClientName(SYNTHV1_TITLE), m_pSynth(nullptr), m_pWidget(nullptr)
m_sClientName(PROJECT_NAME), m_pSynth(nullptr), m_pWidget(nullptr)
#ifdef CONFIG_NSM
, m_pNsmClient(nullptr)
#endif
Expand All @@ -753,11 +753,11 @@ synthv1_jack_application::synthv1_jack_application ( int& argc, char **argv )
#endif
QApplication *pApp = new QApplication(argc, argv);
#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
pApp->setApplicationDisplayName(SYNTHV1_TITLE);
// SYNTHV1_TITLE " - " + QObject::tr(SYNTHV1_SUBTITLE));
pApp->setApplicationDisplayName(PROJECT_NAME);
// PROJECT_NAME " - " + QObject::tr(PROJECT_DESCRIPTION));
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
pApp->setDesktopFileName(
QString("org.rncbc.%1").arg(PACKAGE_TARNAME));
QString("org.rncbc.%1").arg(PROJECT_NAME));
#endif
#endif
m_pApp = pApp;
Expand All @@ -766,8 +766,8 @@ synthv1_jack_application::synthv1_jack_application ( int& argc, char **argv )
}

#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
m_pApp->setApplicationName(SYNTHV1_TITLE);
QString sVersion(CONFIG_BUILD_VERSION);
m_pApp->setApplicationName(PROJECT_NAME);
QString sVersion(PROJECT_VERSION);
sVersion += '\n';
sVersion += QString("Qt: %1").arg(qVersion());
#if defined(QT_STATIC)
Expand Down Expand Up @@ -855,17 +855,17 @@ bool synthv1_jack_application::parse_args (void)

QCommandLineParser parser;
parser.setApplicationDescription(
SYNTHV1_TITLE " - " + QObject::tr(SYNTHV1_SUBTITLE));
PROJECT_NAME " - " + QObject::tr(PROJECT_DESCRIPTION));

parser.addOption({{"g", "no-gui"},
QObject::tr("Disable the graphical user interface (GUI)")});
parser.addOption({{"n", "client-name"},
QObject::tr("Set the JACK client name (default: %1)")
.arg(SYNTHV1_TITLE), "label"});
.arg(PROJECT_NAME), "label"});
parser.addHelpOption();
parser.addVersionOption();
parser.addPositionalArgument("preset-file",
QObject::tr("Load preset file (.%1)").arg(SYNTHV1_TITLE),
QObject::tr("Load preset file (.%1)").arg(PROJECT_NAME),
QObject::tr("[preset-file]"));
parser.process(args);

Expand Down Expand Up @@ -921,12 +921,12 @@ bool synthv1_jack_application::parse_args (void)
const QString sEot = "\n\t";
const QString sEol = "\n\n";
out << QObject::tr("Usage: %1 [options]").arg(args.at(0)) + sEol;
out << SYNTHV1_TITLE " - " << QObject::tr(SYNTHV1_SUBTITLE) + sEol;
out << PROJECT_NAME " - " << QObject::tr(PROJECT_DESCRIPTION) + sEol;
out << QObject::tr("Options:") + sEol;
out << " -g, --no-gui" + sEot +
QObject::tr("Disable the graphical user interface (GUI)") + sEol;
out << " -n, --client-name=[label]" + sEot +
QObject::tr("Set the JACK client name (default: %1)").arg(SYNTHV1_TITLE) + sEol;
QObject::tr("Set the JACK client name (default: %1)").arg(PROJECT_NAME) + sEol;
out << " -h, --help" + sEot +
QObject::tr("Show help about command line options.") + sEol;
out << " -v, --version" + sEot +
Expand All @@ -941,8 +941,8 @@ bool synthv1_jack_application::parse_args (void)
#endif
out << '\n';
out << QString("%1: %2\n")
.arg(SYNTHV1_TITLE)
.arg(CONFIG_BUILD_VERSION);
.arg(PROJECT_NAME)
.arg(PROJECT_VERSION);
return false;
}
else {
Expand Down Expand Up @@ -1013,7 +1013,7 @@ bool synthv1_jack_application::setup (void)
QString caps(":switch:dirty:");
if (m_bGui)
caps += "optional-gui:";
m_pNsmClient->announce(SYNTHV1_TITLE, caps.toLocal8Bit().constData());
m_pNsmClient->announce(PROJECT_NAME, caps.toLocal8Bit().constData());
if (m_pWidget)
m_pWidget->setNsmClient(m_pNsmClient);
}
Expand Down Expand Up @@ -1069,9 +1069,9 @@ void synthv1_jack_application::openSession (void)

bool bOpen = false;

QFileInfo fi(path_name, "session." SYNTHV1_TITLE);
QFileInfo fi(path_name, "session." PROJECT_NAME);
if (!fi.exists())
fi.setFile(path_name, display_name + '.' + SYNTHV1_TITLE);
fi.setFile(path_name, display_name + '.' + PROJECT_NAME);
if (fi.exists()) {
const QString& sFilename = fi.absoluteFilePath();
if (m_pWidget) {
Expand Down Expand Up @@ -1108,8 +1108,8 @@ void synthv1_jack_application::saveSession (void)
// const QString& client_name = m_pNsmClient->client_name();
const QString& path_name = m_pNsmClient->path_name();
// const QString& display_name = m_pNsmClient->display_name();
// const QFileInfo fi(path_name, display_name + '.' + SYNTHV1_TITLE);
const QFileInfo fi(path_name, "session." SYNTHV1_TITLE);
// const QFileInfo fi(path_name, display_name + '.' + PROJECT_NAME);
const QFileInfo fi(path_name, "session." PROJECT_NAME);

const bool bSave
= synthv1_param::savePreset(m_pSynth, fi.absoluteFilePath(), true);
Expand Down
2 changes: 1 addition & 1 deletion src/synthv1_jack.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// synthv1_jack.h
//
/****************************************************************************
Copyright (C) 2012-2023, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down
8 changes: 4 additions & 4 deletions src/synthv1_lv2.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// synthv1_lv2.cpp
//
/****************************************************************************
Copyright (C) 2012-2023, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -393,7 +393,7 @@ void synthv1_lv2::qapp_instantiate (void)
{
if (qApp == nullptr && g_qapp_instance == nullptr) {
static int s_argc = 1;
static const char *s_argv[] = { SYNTHV1_TITLE, nullptr };
static const char *s_argv[] = { PROJECT_NAME, nullptr };
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32)
::_putenv_s("QT_NO_GLIB", "1"); // Avoid glib event-loop...
#else
Expand Down Expand Up @@ -462,7 +462,7 @@ static LV2_State_Status synthv1_lv2_state_save ( LV2_Handle instance,
flags |= (LV2_STATE_IS_POD | LV2_STATE_IS_PORTABLE);
#endif

QDomDocument doc(SYNTHV1_TITLE);
QDomDocument doc(PROJECT_NAME);
QDomElement eState = doc.createElement("state");

QDomElement eTuning = doc.createElement("tuning");
Expand Down Expand Up @@ -516,7 +516,7 @@ static LV2_State_Status synthv1_lv2_state_restore ( LV2_Handle instance,
if (value == nullptr)
return LV2_STATE_ERR_UNKNOWN;

QDomDocument doc(SYNTHV1_TITLE);
QDomDocument doc(PROJECT_NAME);
if (doc.setContent(QByteArray(value, size))) {
QDomElement eState = doc.documentElement();
if (eState.tagName() == "state") {
Expand Down
2 changes: 1 addition & 1 deletion src/synthv1_lv2.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// synthv1_lv2.h
//
/****************************************************************************
Copyright (C) 2012-2023, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions src/synthv1_param.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ bool synthv1_param::loadPreset (
const QDir currentDir(QDir::current());
QDir::setCurrent(fi.absolutePath());

QDomDocument doc(SYNTHV1_TITLE);
QDomDocument doc(PROJECT_NAME);
if (doc.setContent(&file)) {
QDomElement ePreset = doc.documentElement();
if (ePreset.tagName() == "preset") {
Expand Down Expand Up @@ -376,7 +376,7 @@ bool synthv1_param::savePreset (
const QDir currentDir(QDir::current());
QDir::setCurrent(fi.absolutePath());

QDomDocument doc(SYNTHV1_TITLE);
QDomDocument doc(PROJECT_NAME);
QDomElement ePreset = doc.createElement("preset");
ePreset.setAttribute("name", fi.completeBaseName());
ePreset.setAttribute("version", PROJECT_VERSION);
Expand Down
12 changes: 6 additions & 6 deletions src/synthv1widget.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// synthv1widget.cpp
//
/****************************************************************************
Copyright (C) 2012-2023, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -1529,10 +1529,10 @@ void synthv1widget::helpAbout (void)
list << tr("LV2 plug-in build disabled.");
#endif

QString sText = "<h1>" SYNTHV1_TITLE "</h1>\n";
sText += "<p>" + tr(SYNTHV1_SUBTITLE) + "<br />\n";
QString sText = "<h1>" PROJECT_NAME "</h1>\n";
sText += "<p>" + tr(PROJECT_DESCRIPTION) + "<br />\n";
sText += "<br />\n";
sText += tr("Version") + ": <b>" CONFIG_BUILD_VERSION "</b><br />\n";
sText += tr("Version") + ": <b>" PROJECT_VERSION "</b><br />\n";
// sText += "<small>" + tr("Build") + ": " CONFIG_BUILD_DATE "</small><br />\n";
if (!list.isEmpty()) {
sText += "<small><font color=\"red\">";
Expand All @@ -1546,10 +1546,10 @@ void synthv1widget::helpAbout (void)
#endif
sText += "<br />\n";
sText += "<br />\n";
sText += tr("Website") + ": <a href=\"" SYNTHV1_WEBSITE "\">" SYNTHV1_WEBSITE "</a><br />\n";
sText += tr("Website") + ": <a href=\"" PROJECT_HOMEPAGE_URL "\">" PROJECT_HOMEPAGE_URL "</a><br />\n";
sText += "<br />\n";
sText += "<small>";
sText += SYNTHV1_COPYRIGHT "<br />\n";
sText += PROJECT_COPYRIGHT "<br />\n";
sText += "<br />\n";
sText += tr("This program is free software; you can redistribute it and/or modify it") + "<br />\n";
sText += tr("under the terms of the GNU General Public License version 2 or later.");
Expand Down
2 changes: 1 addition & 1 deletion src/synthv1widget.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// synthv1widget.h
//
/****************************************************************************
Copyright (C) 2012-2023, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion src/synthv1widget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<author>rncbc aka Rui Nuno Capela</author>
<comment>synthv1 - an old-school polyphonic synthesizer

Copyright (C) 2012-2023, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down
6 changes: 3 additions & 3 deletions src/synthv1widget_preset.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// synthv1widget_preset.cpp
//
/****************************************************************************
Copyright (C) 2012-2020, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -233,7 +233,7 @@ void synthv1widget_preset::openPreset (void)

QStringList files;

const QString sExt(SYNTHV1_TITLE);
const QString sExt(PROJECT_NAME);
const QString& sTitle = tr("Open Preset");
const QString& sFilter = tr("Preset files (*.%1)").arg(sExt);

Expand Down Expand Up @@ -299,7 +299,7 @@ void synthv1widget_preset::savePreset ( const QString& sPreset )
if (pConfig == nullptr)
return;

const QString sExt(SYNTHV1_TITLE);
const QString sExt(PROJECT_NAME);
QFileInfo fi(QDir(pConfig->sPresetDir), sPreset + '.' + sExt);
QString sFilename = fi.absoluteFilePath();
if (!fi.exists()) {
Expand Down
2 changes: 1 addition & 1 deletion src/synthv1widget_preset.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// synthv1widget_preset.h
//
/****************************************************************************
Copyright (C) 2012-2020, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2012-2024, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down

0 comments on commit 5b3fd2e

Please sign in to comment.