From 23839e4a91561f0d97ca52fa66d1f03756178cc0 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 9 Jun 2019 10:53:06 +0200 Subject: [PATCH] Remove openAV references from the code --- Doxyfile | 2 +- PACKAGING | 2 +- meson.build | 2 +- resources/metadata/loopp.appdata.xml | 6 +++--- src/diskreader.cxx | 8 ++++---- src/diskwriter.cxx | 22 +++++++++++----------- src/dsp/dsp_dbmeter.hxx | 6 +++--- src/dsp/dsp_reverb.hxx | 6 +++--- src/dsp/dsp_sidechain_gain.hxx | 6 +++--- src/goptions.cxx | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Doxyfile b/Doxyfile index 1dac081..0573209 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "openAV - Loopp" +PROJECT_NAME = "Loopp" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/PACKAGING b/PACKAGING index fc10a58..ebb79b9 100644 --- a/PACKAGING +++ b/PACKAGING @@ -1,6 +1,6 @@ Thanks for looking into packaging Loopp: -OpenAV couldn't possibly package for every distro, +We couldn't possibly package for every distro, your work is apprecatied! CMake is used as the build system, checkout the compile.sh diff --git a/meson.build b/meson.build index 67d3fb8..39c39d7 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project( 'openav_loopp', ['c','cpp'], +project( 'loopp', ['c','cpp'], default_options : [ 'cpp_std=c++11', ]) diff --git a/resources/metadata/loopp.appdata.xml b/resources/metadata/loopp.appdata.xml index b0ded44..a487b3b 100644 --- a/resources/metadata/loopp.appdata.xml +++ b/resources/metadata/loopp.appdata.xml @@ -2,7 +2,7 @@ loopp.desktop CC0 - OpenAV Loopp + Loopp

Loopp is a music creation tool, intended for live use. It @@ -22,8 +22,8 @@ - https://raw.github.com/harryhaaren/openAV-Loopp/master/resources/screenshots/1.0.png + https://git.netzspielplatz.de/soundship/loopp/raw/master/resources/screenshots/1.2.png - http://openavproductions.com/loopp + http://loopp.soundship.de/ zbyszek@in.waw.pl diff --git a/src/diskreader.cxx b/src/diskreader.cxx index 898e4a4..f781f09 100644 --- a/src/diskreader.cxx +++ b/src/diskreader.cxx @@ -52,7 +52,7 @@ DiskReader::DiskReader() int DiskReader::loadPreferences() { stringstream s; - s << getenv("HOME") << "/.config/openAV/loopp/loopp.prfs"; + s << getenv("HOME") << "/.config/soundship/loopp/loopp.prfs"; std::ifstream sampleFile( s.str().c_str(), std::ios_base::in|std::ios_base::ate); long file_length = sampleFile.tellg(); @@ -73,7 +73,7 @@ int DiskReader::loadPreferences() if ( resample ) { resampleQuality = resample->valueint; if ( resampleQuality == 0 ) { - LOOPP_NOTE("Using Linear resampling, may reduce quality. Check .config/openAV/loopp/loopp.prfs"); + LOOPP_NOTE("Using Linear resampling, may reduce quality. Check .config/soundship/loopp/loopp.prfs"); } } cJSON* ctlrs = cJSON_GetObjectItem( preferencesJson, "defaultControllers" ); @@ -85,7 +85,7 @@ int DiskReader::loadPreferences() if( ctlr ) { LOOPP_NOTE("Loading controller %s", ctlr->valuestring); stringstream s; - s << getenv("HOME") << "/.config/openAV/loopp/controllers/" << ctlr->valuestring; + s << getenv("HOME") << "/.config/soundship/loopp/controllers/" << ctlr->valuestring; gui->addMidiControllerToSetup( s.str() ); } } @@ -131,7 +131,7 @@ int DiskReader::loadPreferences() delete[] sampleString; } else { // empty file / file no exists: - LOOPP_WARN("Preferences, file doesn't exist: ~/.config/openAV/loopp/loopp.prefs"); + LOOPP_WARN("Preferences, file doesn't exist: ~/.config/soundship/loopp/loopp.prefs"); // so write default file gui->getDiskWriter()->writeDefaultConfigToUserHome(); diff --git a/src/diskwriter.cxx b/src/diskwriter.cxx index cf6e005..2d641f7 100644 --- a/src/diskwriter.cxx +++ b/src/diskwriter.cxx @@ -55,38 +55,38 @@ DiskWriter::DiskWriter() sessionName = "session"; foldersCreated = false; - // create .config/openAV/loopp/ directory + // create .config/soundship/loopp/ directory stringstream dotConfig; - dotConfig << getenv("HOME") << "/.config/openAV/"; + dotConfig << getenv("HOME") << "/.config/sounudship/"; int dotConfigDir = mkdir( dotConfig.str().c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH ); if ( errno == EEXIST ) { //LOOPP_NOTE("dotConfigDir exists"); } else if ( dotConfigDir ) { LOOPP_WARN("Error creating dotConfigDir: %s", strerror(errno)); } else { - LOOPP_NOTE("Creating .config/openAV/ directory"); + LOOPP_NOTE("Creating .config/soundship/ directory"); } stringstream dotConfigLoopp; - dotConfigLoopp << getenv("HOME") << "/.config/openAV/loopp"; + dotConfigLoopp << getenv("HOME") << "/.config/soundship/loopp"; int dotConfigLooppDir = mkdir( dotConfigLoopp.str().c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH ); if ( errno == EEXIST ) { //LOOPP_NOTE("dotConfigLooppDir exists"); } else if ( dotConfigLooppDir ) { LOOPP_WARN("Error creating dotConfigLooppDir: %s", strerror(errno)); } else { - LOOPP_NOTE("Creating .config/openAV/loopp directory"); + LOOPP_NOTE("Creating .config/soundship/loopp directory"); } stringstream dotConfigCtlr; - dotConfigCtlr << getenv("HOME") << "/.config/openAV/loopp/controllers/"; + dotConfigCtlr << getenv("HOME") << "/.config/soundship/loopp/controllers/"; int dotConfigCtlrDir = mkdir( dotConfigCtlr.str().c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH ); if ( errno == EEXIST ) { //LOOPP_NOTE("dotConfigCtlrDir exists"); } else if ( dotConfigCtlrDir ) { LOOPP_WARN("Error creating dotConfigCtlrDir: %s", strerror(errno)); } else { - LOOPP_NOTE("Creating .config/openAV/loopp directory"); + LOOPP_NOTE("Creating .config/soundship/loopp directory"); } } @@ -220,7 +220,7 @@ int DiskWriter::writeControllerFile( Controller* c ) // write the sample JSON node to /sample.cfg stringstream controllerCfgPath; - controllerCfgPath << getenv("HOME") << "/.config/openAV/loopp/controllers/" << g->getName() << ".ctlr"; + controllerCfgPath << getenv("HOME") << "/.config/soundship/loopp/controllers/" << g->getName() << ".ctlr"; ifstream infile( controllerCfgPath.str().c_str() ); if ( infile.good() ) { @@ -236,7 +236,7 @@ int DiskWriter::writeControllerFile( Controller* c ) if ( name ) { // clear the filename controllerCfgPath.str( "" ); - controllerCfgPath << getenv("HOME") << "/.config/openAV/loopp/controllers/" << name << ".ctlr"; + controllerCfgPath << getenv("HOME") << "/.config/soundship/loopp/controllers/" << name << ".ctlr"; LOOPP_NOTE( "New .ctlr filename %s", controllerCfgPath.str().c_str() ); } else { LOOPP_NOTE("No name entered for .ctlr file, canceling!"); @@ -478,9 +478,9 @@ void DiskWriter::writeDefaultConfigToUserHome() // cout << endl << cJSON_Print( prfs ) << endl << endl; - // write JSON to .config/openAV/loopp/loopp.prfs + // write JSON to .config/soundship/loopp/loopp.prfs stringstream f; - f << getenv("HOME") << "/.config/openAV/loopp/loopp.prfs"; + f << getenv("HOME") << "/.config/soundship/loopp/loopp.prfs"; ofstream outFile; outFile.open ( f.str().c_str() ); diff --git a/src/dsp/dsp_dbmeter.hxx b/src/dsp/dsp_dbmeter.hxx index bfde25d..d8b0527 100644 --- a/src/dsp/dsp_dbmeter.hxx +++ b/src/dsp/dsp_dbmeter.hxx @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef OPENAV_DSP_DBMETER_H -#define OPENAV_DSP_DBMETER_H +#ifndef LOOPP_DSP_DBMETER_H +#define LOOPP_DSP_DBMETER_H #include @@ -90,5 +90,5 @@ private: float fvbargraph1; }; -#endif // OPENAV_DSP_DBMETER_H +#endif // LOOPP_DSP_DBMETER_H diff --git a/src/dsp/dsp_reverb.hxx b/src/dsp/dsp_reverb.hxx index 28faf44..5692902 100644 --- a/src/dsp/dsp_reverb.hxx +++ b/src/dsp/dsp_reverb.hxx @@ -17,8 +17,8 @@ */ -#ifndef OPENAV_DSP_REVERB_H -#define OPENAV_DSP_REVERB_H +#ifndef LOOPP_DSP_REVERB_H +#define LOOPP_DSP_REVERB_H #include #include @@ -499,4 +499,4 @@ private: } }; -#endif // OPENAV_DSP_REVERB_H +#endif // LOOPP_DSP_REVERB_H diff --git a/src/dsp/dsp_sidechain_gain.hxx b/src/dsp/dsp_sidechain_gain.hxx index e097c69..20af3b8 100644 --- a/src/dsp/dsp_sidechain_gain.hxx +++ b/src/dsp/dsp_sidechain_gain.hxx @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef OPENAV_DSP_SIDECHAIN_GAIN_H -#define OPENAV_DSP_SIDECHAIN_GAIN_H +#ifndef LOOPP_DSP_SIDECHAIN_GAIN_H +#define LOOPP_DSP_SIDECHAIN_GAIN_H #include #include @@ -72,4 +72,4 @@ private: float currentTarget; }; -#endif // OPENAV_DSP_SIDECHAIN_GAIN_H +#endif // LOOPP_DSP_SIDECHAIN_GAIN_H diff --git a/src/goptions.cxx b/src/goptions.cxx index 2a15f72..f7ae787 100644 --- a/src/goptions.cxx +++ b/src/goptions.cxx @@ -153,7 +153,7 @@ static void selectLoadController(Fl_Widget* w, void* data) fnfc.filter("Controllers\t*.ctlr"); stringstream s; - s << getenv("HOME") << "/.config/openAV/loopp/controllers/"; + s << getenv("HOME") << "/.config/soundship/loopp/controllers/"; fnfc.directory( s.str().c_str() ); // default directory to use // Show native chooser switch ( fnfc.show() ) {