Skip to content

Commit

Permalink
Renommage de borderlands en frontieres (#17)
Browse files Browse the repository at this point in the history
Passage de "Borderlands" à "Frontieres". Voir #13 .
  • Loading branch information
olof29 authored and trebmuh committed Oct 2, 2018
1 parent 5e3a07b commit 4c0660b
Show file tree
Hide file tree
Showing 33 changed files with 111 additions and 111 deletions.
4 changes: 2 additions & 2 deletions AudioFileSet.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES : An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -22,7 +22,7 @@

//
// AudioFileSet.cpp
// Borderlands
// Frontieres
//
// Created by Christopher Carlson on 11/21/11.
//
Expand Down
4 changes: 2 additions & 2 deletions AudioFileSet.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -22,7 +22,7 @@

//
// AudioFileSet.h
// Borderlands
// Frontieres
//
// Created by Christopher Carlson on 11/21/11.
//
Expand Down
36 changes: 18 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3)

# TODO Windows & Mac

project(Borderlands LANGUAGES C CXX)
project(Frontieres LANGUAGES C CXX)

enable_language(C)
enable_language(CXX)
Expand All @@ -14,8 +14,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")

add_executable(Borderlands WIN32
Borderlands.cpp
add_executable(Frontieres WIN32
Frontieres.cpp
SoundRect.cpp
GTime.cpp
AudioFileSet.cpp
Expand All @@ -31,12 +31,12 @@ add_executable(Borderlands WIN32
libraries/RtAudio.cpp
libraries/RtMidi.cpp
libraries/ring_buffer.cpp)
target_include_directories(Borderlands
target_include_directories(Frontieres
PRIVATE "." PRIVATE "libraries" PRIVATE "libraries/QtFont3D")

include(FindPkgConfig)

target_compile_definitions(Borderlands
target_compile_definitions(Frontieres
PRIVATE "__LINUX_ALSASEQ__=" "__UNIX_JACK__="
PRIVATE "INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\""
PRIVATE "DATA_ROOT_DIR=\"${CMAKE_INSTALL_FULL_DATAROOTDIR}\"")
Expand All @@ -51,9 +51,9 @@ include(FindPkgConfig)
pkg_check_modules(SNDFILE sndfile REQUIRED)
pkg_check_modules(SOXR soxr REQUIRED)

target_link_libraries(Borderlands
target_link_libraries(Frontieres
PRIVATE ${OPENGL_LIBRARIES} ${JACK_LIBRARIES} ${ALSA_LIBRARIES} ${SNDFILE_LIBRARIES} ${SOXR_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")
target_include_directories(Borderlands
target_include_directories(Frontieres
PRIVATE "${OPENGL_INCLUDE_DIR}" ${JACK_INCLUDE_DIRS} ${ALSA_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS} ${SOXR_INCLUDE_DIRS})

# Qt
Expand All @@ -62,37 +62,37 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
find_package(Qt5Widgets CONFIG REQUIRED)
find_package(Qt5OpenGL CONFIG REQUIRED)
target_link_libraries(Borderlands PRIVATE Qt5::Widgets Qt5::OpenGL)
target_link_libraries(Frontieres PRIVATE Qt5::Widgets Qt5::OpenGL)

# I18n
find_package(Qt5LinguistTools REQUIRED)
qt5_add_translation(TRANSLATIONS
"translations/Borderlands_fr_FR.ts")
add_custom_target(Borderlands_translations ALL
"translations/Frontieres_fr_FR.ts")
add_custom_target(Frontieres_translations ALL
DEPENDS ${TRANSLATIONS})
install(FILES ${TRANSLATIONS}
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/Borderlands/translations")
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/Frontieres/translations")

# Install
install(TARGETS Borderlands DESTINATION "${CMAKE_INSTALL_BINDIR}")
install(TARGETS Frontieres DESTINATION "${CMAKE_INSTALL_BINDIR}")
install(FILES
loops/2_rhodes_high_2.wav
loops/2_rhodes_refrain_2.wav
loops/hidden_mechanics_stems_borderlands_stereo.wav
loops/hidden_mechanics_stems_Frontieres_stereo.wav
loops/pretty_rhodes_delay.wav
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/Borderlands/loops")
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/Frontieres/loops")
install(FILES
resources/borderlands.desktop
resources/Frontieres.desktop
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
install(FILES
resources/borderlands.png
resources/Frontieres.png
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pixmaps")
install(FILES
resources/Borderlands.1
resources/Frontieres.1
DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
set(MAN_TRANSLATIONS "fr")
foreach(translation ${MAN_TRANSLATIONS})
install(FILES
"resources/Borderlands.${translation}.1"
"resources/Frontieres.${translation}.1"
DESTINATION "${CMAKE_INSTALL_MANDIR}/fr/man1")
endforeach()
18 changes: 9 additions & 9 deletions Borderlands.cpp → Frontieres.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -22,15 +22,15 @@

//
// main.cpp
// Borderlands
// Frontieres
//
// Created by Christopher Carlson on 11/13/11.
//


// my includes
#include "theglobals.h"
#include "Borderlands.h"
#include "Frontieres.h"

// graphics includes
#ifdef __MACOSX_CORE__
Expand Down Expand Up @@ -392,7 +392,7 @@ void printUsage()
float theA = 0.6f + 0.2 * sin(0.8 * PI * GTime::instance().sec);
glColor4f(theA, theA, theA, theA);
draw_string(screenWidth / 2.0f + 0.2f * (float)screenWidth, (float)screenHeight / 2.0f,
0.5f, "BORDERLANDS", (float)screenWidth * 0.1f);
0.5f, "FRONTIERES", (float)screenWidth * 0.1f);

theA = 0.6f + 0.2 * sin(0.9 * PI * GTime::instance().sec);
float insColor = theA * 0.4f;
Expand All @@ -416,7 +416,7 @@ void printUsage()
// key info
draw_string(screenWidth / 2.0f + 0.2f * (float)screenWidth + 10.0,
(float)screenHeight / 2.0f + 70.0, 0.5f,
_Q("", "PUT THE SAMPLES IN ~/.Borderlands/loops"), (float)screenWidth * 0.04f);
_Q("", "PUT THE SAMPLES IN ~/.Frontieres/loops"), (float)screenWidth * 0.04f);
}


Expand Down Expand Up @@ -820,7 +820,7 @@ int main(int argc, char **argv)
//-------------Midi Configuration-----------//
theMidiInBuffer = new Ring_Buffer(1024);
try {
theMidiIn = new RtMidiIn(RtMidi::UNSPECIFIED, "Borderlands", theMidiInBuffer->capacity());
theMidiIn = new RtMidiIn(RtMidi::UNSPECIFIED, "Frontieres", theMidiInBuffer->capacity());
theMidiIn->setCallback(&midiInCallback);
theMidiIn->openVirtualPort();
}
Expand All @@ -846,9 +846,9 @@ int main(int argc, char **argv)

// load sounds
string homeUser = getenv("HOME");
string programPathUser = homeUser + "/.Borderlands/";
string audioPathUser = homeUser + "/.Borderlands/loops/";
string audioPathDefault = DATA_ROOT_DIR "/Borderlands/loops/";
string programPathUser = homeUser + "/.Frontieres/";
string audioPathUser = homeUser + "/.Frontieres/loops/";
string audioPathDefault = DATA_ROOT_DIR "/Frontieres/loops/";
mkdir(programPathUser.c_str(), 0755);
mkdir(audioPathUser.c_str(), 0755);

Expand Down
8 changes: 4 additions & 4 deletions Borderlands.h → Frontieres.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -19,8 +19,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#ifndef BORDERLANDS_H
#define BORDERLANDS_H
#ifndef FRONTIERES_H
#define FRONTIERES_H

#include <string>
#include <vector>
Expand Down Expand Up @@ -134,4 +134,4 @@ void printParam();

void cleaningFunction();

#endif // BORDERLANDS_H
#endif // FRONTIERES_H
4 changes: 2 additions & 2 deletions GTime.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -22,7 +22,7 @@

//
// GTime.cpp
// Borderlands
// Frontieres
//
// Created by Christopher Carlson on 12/2/11.
//
Expand Down
6 changes: 3 additions & 3 deletions GTime.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -22,7 +22,7 @@

//
// GTime.h
// Borderlands
// Frontieres
//
// Created by Christopher Carlson on 12/2/11.
//
Expand All @@ -43,4 +43,4 @@ class GTime {
GTime();
};

#endif
#endif
4 changes: 2 additions & 2 deletions GrainCluster.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -21,7 +21,7 @@

//
// GrainCluster.cpp
// Borderlands
// Frontieres
//
// Created by Christopher Carlson on 11/23/11.
//
Expand Down
6 changes: 3 additions & 3 deletions GrainCluster.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -22,7 +22,7 @@

//
// GrainCluster.h
// Borderlands
// Frontieres
//
// Created by Christopher Carlson on 11/15/11.
//
Expand Down Expand Up @@ -251,4 +251,4 @@ class GrainClusterVis {
};


#endif
#endif
4 changes: 2 additions & 2 deletions GrainVoice.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -22,7 +22,7 @@

//
// GrainVoice.cpp
// Borderlands
// Frontieres
//
// Created by Christopher Carlson on 11/20/11.
//
Expand Down
4 changes: 2 additions & 2 deletions GrainVoice.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -22,7 +22,7 @@

//
// GrainVoice.h
// Borderlands
// Frontieres
//
// Created by Christopher Carlson on 11/13/11.
//
Expand Down
8 changes: 4 additions & 4 deletions I18n.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand All @@ -23,16 +23,16 @@

#include <QCoreApplication>

#if !defined(BORDERLANDS_DISABLE_I18N)
#if !defined(FRONTIERES_DISABLE_I18N)

// translate to QString
#define _Q(c, x) (QCoreApplication::translate(c, x))
// translate to std::string
#define _S(c, x) (_Q(c, x).toStdString())

#else // !defined(BORDERLANDS_DISABLE_I18N)
#else // !defined(FRONTIERES_DISABLE_I18N)

#define _Q(c, x) QString(x)
#define _S(c, x) std::string(x)

#endif // !defined(BORDERLANDS_DISABLE_I18N)
#endif // !defined(FRONTIERES_DISABLE_I18N)
6 changes: 3 additions & 3 deletions MyGLApplication.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand Down Expand Up @@ -58,7 +58,7 @@ MyGLApplication::MyGLApplication(int &argc, char *argv[])
// set up the translations
QString language = QLocale::system().name();
P->qtTranslator.load("qt_" + language, qtTranslationDir);
P->appTranslator.load("Borderlands_" + language, appTranslationDir);
P->appTranslator.load("Frontieres_" + language, appTranslationDir);

// init graphic components
MyGLWindow *window = new MyGLWindow;
Expand Down Expand Up @@ -107,6 +107,6 @@ QString MyGLApplication::Impl::getAppTranslationDir() const
return getQtTranslationDir();
#else
// search in the shared data path
return DATA_ROOT_DIR "/Borderlands/translations";
return DATA_ROOT_DIR "/Frontieres/translations";
#endif
}
2 changes: 1 addition & 1 deletion MyGLApplication.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// BORDERLANDS: An interactive granular sampler.
// FRONTIERES: An interactive granular sampler.
//------------------------------------------------------------------------------
// More information is available at
// http::/ccrma.stanford.edu/~carlsonc/256a/Borderlands/index.html
Expand Down
Loading

0 comments on commit 4c0660b

Please sign in to comment.