Merge pull request #92 from jonadem/master

Make the 'make install' works

Makefile.am

@@ -1 +1 @@
-SUBDIRS = src
+SUBDIRS = src graphics fonts songs

configure.ac

@@ -25,7 +25,12 @@ AC_CHECK_HEADERS([string string.h iostream algorithm locale vector sstream queue
 
 PKG_CHECK_MODULES(SFML, sfml-graphics)
 
+# Flags
+datdir=$datadir/$PACKAGE
+AC_SUBST(datdir)
+
 CXXFLAGS="$CXXFLAGS -std=c++11"
+CXXFLAGS="$CXXFLAGS -DDATADIR=\\\"$datdir\\\""
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_CHECK_HEADER_STDBOOL
@@ -36,5 +41,10 @@ AC_TYPE_UINT32_T
 # Checks for library functions.
 AC_CHECK_FUNCS([gettimeofday])
 
-AC_CONFIG_FILES([Makefile src/Makefile])
+AC_CONFIG_FILES([
+		 Makefile
+		 src/Makefile
+		 graphics/Makefile
+		 fonts/Makefile
+		 songs/Makefile])
 AC_OUTPUT

fonts/Makefile.am

@@ -0,0 +1,7 @@
+EXTRA_DIST = FaunaOne-Regular.ttf
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDOR)$(datdir)/fonts
+	@for file in $(EXTRA_DIST); do\
+		$(INSTALL_DATA) $$file $(DESTDIR)$(datdir)/fonts/$$file;\
+	done

graphics/Makefile.am

@@ -0,0 +1,9 @@
+EXTRA_DIST = button.png button2line.png InterfaceButtons.tga \
+keyboard_top_separator.png longbutton.png star.png thumb_down.png \
+title_Logo.png trackbox.png
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDOR)$(datdir)/graphics
+	@for file in $(EXTRA_DIST); do\
+		$(INSTALL_DATA) $$file $(DESTDIR)$(datdir)/graphics/$$file;\
+	done

songs/Makefile.am

@@ -0,0 +1,11 @@
+EXTRA_DIST = Aria-Notebook_AM_Bach.mid Fur_Elise-Beethoven.mid \
+Minuet_in_F-Leopold_Mozart.mid Rondino-Rameau.mid Sonatina_in_C-Latour.mid \
+Clementi_Opus_36_no_1_First_Movement.mid Minuet_in_G-JS_Bach.mid \
+Russian_Folksong-Beethoven.mid
+
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDOR)$(datdir)/songs
+	@for file in $(EXTRA_DIST); do\
+		$(INSTALL_DATA) $$file $(DESTDIR)$(datdir)/songs/$$file;\
+	done

src/Makefile.am

@@ -32,7 +32,8 @@ linthesia_SOURCES = main.cpp \
 	screens/one_player_screen/black_note_to_play.cpp \
 	screens/file_select_screen/file_select_screen.cpp \
 	screens/select_track_screen/track_box.cpp \
-	screens/select_track_screen/select_track_screen.cpp
+	screens/select_track_screen/select_track_screen.cpp \
+	utilities/util.c
 
 linthesia_DEPENDENCIES = libmidi.la
 

src/assets/path.h

@@ -1,8 +1,10 @@
 #ifndef LINTHESIA_ASSET_PATH_H
 #define LINTHESIA_ASSET_PATH_H
 
-#define GRAPHICS_DIR "../graphics/"
-#define FONTS_DIR "../fonts/"
-#define DEFAULT_FONT FONTS_DIR "FaunaOne-Regular.ttf"
+#define GRAPHICS_DIR DATADIR "/graphics/"
+#define LOCAL_GRAPHICS_DIR "../graphics/"
+#define FONTS_DIR DATADIR "/fonts/"
+#define LOCAL_FONTS_DIR "../fonts/"
+#define DEFAULT_FONT "FaunaOne-Regular.ttf"
 
 #endif

src/buttons/long_one_line_button.cpp

@@ -1,10 +1,12 @@
 #include <iostream>
+#include <algorithm>
 
 #include <SFML/Graphics.hpp>
 #include <SFML/Graphics/Font.hpp>
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/RenderStates.hpp>
 
+#include "utilities/util.h"
 #include "assets/path.h"
 #include "long_one_line_button.h"
 
@@ -19,7 +21,18 @@ sf::Font LongOneLineButton::font = sf::Font();
  */
 void LongOneLineButton::init() {
 
-    const std::string BUTTON = GRAPHICS_DIR "longbutton.png";
+    std::string actual_graphics_dir_path;
+    std::string actual_fonts_dir_path;
+
+    if (dirExists(GRAPHICS_DIR))
+    {
+        actual_graphics_dir_path = GRAPHICS_DIR;
+    }
+    else
+    {
+        actual_graphics_dir_path = LOCAL_GRAPHICS_DIR;
+    }
+    const std::string BUTTON = actual_graphics_dir_path + "longbutton.png";
     if (!texture.loadFromFile(BUTTON)) {
         std::cerr
             << "Can't load "
@@ -29,10 +42,18 @@ void LongOneLineButton::init() {
     }
     texture.setSmooth(true);
 
-    if (!font.loadFromFile(DEFAULT_FONT)) {
+    if (dirExists(FONTS_DIR))
+    {
+        actual_fonts_dir_path = FONTS_DIR;
+    }
+    else
+    {
+        actual_fonts_dir_path = LOCAL_FONTS_DIR;
+    }
+    if (!font.loadFromFile(actual_fonts_dir_path + DEFAULT_FONT)) {
         std::cerr
             << "Can't load "
-            << DEFAULT_FONT
+            << actual_fonts_dir_path + DEFAULT_FONT
             << std::endl
         ;
     }

src/buttons/short_one_line_button.cpp

@@ -5,6 +5,7 @@
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/RenderStates.hpp>
 
+#include "utilities/util.h"
 #include "assets/path.h"
 #include "short_one_line_button.h"
 
@@ -18,7 +19,18 @@ sf::Font ShortOneLineButton::font = sf::Font();
  *
  */
 void ShortOneLineButton::init() {
-    const std::string BUTTON = GRAPHICS_DIR "button.png";
+    std::string actual_graphics_dir_path;
+    std::string actual_fonts_dir_path;
+
+    if (dirExists(GRAPHICS_DIR))
+    {
+        actual_graphics_dir_path = GRAPHICS_DIR;
+    }
+    else
+    {
+        actual_graphics_dir_path = LOCAL_GRAPHICS_DIR;
+    }
+    const std::string BUTTON = actual_graphics_dir_path + "button.png";
     if (!texture.loadFromFile(BUTTON)) {
         std::cerr
             << "Can't load "
@@ -28,10 +40,18 @@ void ShortOneLineButton::init() {
     }
     texture.setSmooth(true);
 
-    if (!font.loadFromFile(DEFAULT_FONT)) {
+    if (dirExists(FONTS_DIR))
+    {
+        actual_fonts_dir_path = FONTS_DIR;
+    }
+    else
+    {
+        actual_fonts_dir_path = LOCAL_FONTS_DIR;
+    }
+    if (!font.loadFromFile(actual_fonts_dir_path + DEFAULT_FONT)) {
         std::cerr
             << "Can't load "
-            << DEFAULT_FONT
+            << actual_fonts_dir_path + DEFAULT_FONT
             << std::endl
         ;
     }

src/buttons/two_lines_button.cpp

@@ -5,6 +5,7 @@
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/RenderStates.hpp>
 
+#include "utilities/util.h"
 #include "assets/path.h"
 #include "two_lines_button.h"
 
@@ -25,21 +26,41 @@ TwoLinesButton::TwoLinesButton(
     const unsigned INTER_LINE_SPACE = 15;
     currentState = ButtonStates::NORMAL;
 
-    const std::string BUTTON = GRAPHICS_DIR "button2line.png";
+    std::string actual_graphics_dir_path;
+    std::string actual_fonts_dir_path;
+
+    if (dirExists(GRAPHICS_DIR))
+    {
+        actual_graphics_dir_path = GRAPHICS_DIR;
+    }
+    else
+    {
+        actual_graphics_dir_path = LOCAL_GRAPHICS_DIR;
+    }
+    const std::string BUTTON = actual_graphics_dir_path + "button2line.png";
     if (!texture.loadFromFile(BUTTON)) {
         std::cerr
             << "Can't load "
             << BUTTON
             << std::endl
         ;
     }
+
     texture.setSmooth(true);
     sprite.setTexture(texture);
 
-    if (!font.loadFromFile(DEFAULT_FONT)) {
+    if (dirExists(FONTS_DIR))
+    {
+        actual_fonts_dir_path = FONTS_DIR;
+    }
+    else
+    {
+        actual_fonts_dir_path = LOCAL_FONTS_DIR;
+    }
+    if (!font.loadFromFile(actual_fonts_dir_path + DEFAULT_FONT)) {
         std::cerr
             << "Can't load "
-            << DEFAULT_FONT
+            << actual_fonts_dir_path + DEFAULT_FONT
             << std::endl
         ;
     }

src/icons/icon.cpp

@@ -6,6 +6,7 @@
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/RenderStates.hpp>
 
+#include "utilities/util.h"
 #include "assets/path.h"
 #include "icon.h"
 
@@ -17,7 +18,18 @@ sf::Texture Icon::iconsTexture = sf::Texture();
  *
  */
 void Icon::init() {
-    const std::string INTERFACE_BUTTONS = GRAPHICS_DIR "InterfaceButtons.tga";
+    std::string actual_graphics_dir_path;
+    std::string actual_fonts_dir_path;
+
+    if (dirExists(GRAPHICS_DIR))
+    {
+        actual_graphics_dir_path = GRAPHICS_DIR;
+    }
+    else
+    {
+        actual_graphics_dir_path = LOCAL_GRAPHICS_DIR;
+    }
+    const std::string INTERFACE_BUTTONS = actual_graphics_dir_path + "InterfaceButtons.tga";
     if (!iconsTexture.loadFromFile(INTERFACE_BUTTONS)) {
         std::cerr
             << "Can't load "

src/keyboard/trail.cpp

@@ -3,6 +3,7 @@
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/RenderStates.hpp>
 
+#include "utilities/util.h"
 #include "assets/path.h"
 #include "trail.h"
 
@@ -11,17 +12,25 @@ namespace linthesia {
  *
  */
 KeyboardTrail::KeyboardTrail() {
-    const std::string TOP_SEPARATOR =
-        GRAPHICS_DIR
-        "keyboard_top_separator.png"
-    ;
+    std::string actual_graphics_dir_path;
+
+    if (dirExists(GRAPHICS_DIR))
+    {
+        actual_graphics_dir_path = GRAPHICS_DIR;
+    }
+    else
+    {
+        actual_graphics_dir_path = LOCAL_GRAPHICS_DIR;
+    }
+    const std::string TOP_SEPARATOR = actual_graphics_dir_path + "keyboard_top_separator.png";
     if (!texture.loadFromFile(TOP_SEPARATOR)) {
         std::cerr
             << "Can't load "
             << TOP_SEPARATOR
             << std::endl
         ;
     }
+
     texture.setSmooth(true);
     texture.setRepeated(true);
     sprite.setTexture(texture);

src/screens/file_select_screen/file_select_screen.cpp

@@ -2,6 +2,7 @@
 #include <algorithm>
 
 #include "utilities/tinydir.h"
+#include "utilities/util.h"
 #include "file_select_screen.h"
 
 #include "context/context.h"
@@ -16,7 +17,9 @@ const ScreenIndex FileSelectScreen::INDEX = "file_select_screen";
 /**
  *
  */
-const static std::string MIDI_DIR_PATH("../songs/");
+const static std::string MIDI_DIR_PATH(DATADIR"/songs/");
+const static std::string LOCAL_MIDI_DIR_PATH("../songs/");
+
 
 /**
  *
@@ -87,9 +90,20 @@ ScreenIndex FileSelectScreen::run(
     sf::Event event;
 
     // we initalize the file selector list
-    midiFileNames = get_midi_files(MIDI_DIR_PATH);
+    std::string actual_midi_dir_path;
+    if (dirExists(MIDI_DIR_PATH.c_str()))
+    {
+        actual_midi_dir_path = MIDI_DIR_PATH;
+    }
+    else
+    {
+        actual_midi_dir_path = LOCAL_MIDI_DIR_PATH;
+    }
+
+    midiFileNames = get_midi_files(actual_midi_dir_path);
     fileButtons.clear();
     for (auto fileName : midiFileNames) {
+        std::replace( fileName.begin(), fileName.end(), '_', ' '); // replace all '_' to ' '
         fileButtons.push_back(LongOneLineButton(fileName));
     }
     updateIterators(app);

src/screens/main_screen/main_screen.cpp

@@ -5,6 +5,7 @@
 #include "screens/file_select_screen/file_select_screen.h"
 #include "screens/select_track_screen/select_track_screen.h"
 
+#include "utilities/util.h"
 #include "assets/path.h"
 #include "context/context.h"
 
@@ -34,7 +35,16 @@ MainScreen::MainScreen() :
     selectTrackButton("play"),
     chooseSongButton("song:", "no song selected yet")
 {
-    const std::string LOGO = GRAPHICS_DIR "title_Logo.png";
+    std::string actual_graphics_dir_path;
+    if (dirExists(GRAPHICS_DIR))
+    {
+        actual_graphics_dir_path = GRAPHICS_DIR;
+    }
+    else
+    {
+        actual_graphics_dir_path = LOCAL_GRAPHICS_DIR;
+    }
+    const std::string LOGO = actual_graphics_dir_path + "title_Logo.png";
     if (!logoTexture.loadFromFile(LOGO)) {
         std::cerr
             << "Can't load "