copyright and some minor refactoring

Author: gtrensch

cmake/FindSFMLAUDIO.cmake

@@ -28,9 +28,10 @@
 #   find_package( SFMLAUDIO )
 
 set ( SFMLAUDIO_FOUND False )
-find_path ( SFML_INCLUDE_DIR SFML/AudioXXX.hpp PATH_SUFFIXES )
+find_path ( SFML_INCLUDE_DIR SFML/Audio.hpp PATH_SUFFIXES )
 
 if ( SFML_INCLUDE_DIR )
   set ( SFMLAUDIO_FOUND True )
   message( "-- sfml-audio (Audio.hpp) found in ${SFML_INCLUDE_DIR}")
 endif ()
+

cmake/ProcessDependencies.cmake

@@ -1,7 +1,27 @@
+# examples/MyModule/cmake/ProcessDependencies.cmake
+#
+# This file is part of NEST.
+#
+# Copyright (C) 2004 The NEST Initiative
+#
+# NEST is free software: you can redistribute it and/or modify
+# 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.
+#
+# NEST is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with NEST.  If not, see <http://www.gnu.org/licenses/>.
+
 function( CHECK_HAVE_SFML_AUDIO )
   set( HAVE_SFML_AUDIO OFF PARENT_SCOPE )
   find_package( SFMLAUDIO )
   if ( SFMLAUDIO_FOUND )
     set( HAVE_SFML_AUDIO ON PARENT_SCOPE )
   endif ()
 endfunction()
+

recording_backend_soundclick.cpp

@@ -30,7 +30,7 @@
 // Constructor
 nest::RecordingBackendSoundClick::RecordingBackendSoundClick()
 {
-#if defined( HAVE_SFML_AUDIO )
+#ifdef HAVE_SFML_AUDIO
   // Load the raw sound data into the SFML sound buffer.
   sound_buffer_.loadFromMemory(
     sound_click_16bit_44_1khz_wav, sizeof( sound_click_16bit_44_1khz_wav ) );
@@ -67,7 +67,7 @@ void nest::RecordingBackendSoundClick::enroll( const RecordingDevice& device,
 void
 nest::RecordingBackendSoundClick::initialize()
 {
-#if defined( HAVE_SFML_AUDIO )
+#ifdef HAVE_SFML_AUDIO
   LOG( M_INFO,
     "Recording Backend",
     ( "Recording backend >SoundClick< successfully initialized." ) );
@@ -120,7 +120,7 @@ nest::RecordingBackendSoundClick::write( const RecordingDevice& device,
     usleep( time_lag_us );
   }
 
-#if defined( HAVE_SFML_AUDIO )
+#ifdef HAVE_SFML_AUDIO
   sound_.play();
 #endif
 }

recording_backend_soundclick.h

@@ -28,7 +28,7 @@
 #include "stopwatch.h"
 
 // Simple and Fast Multimedia Library (SFML)
-#if defined( HAVE_SFML_AUDIO )
+#ifdef HAVE_SFML_AUDIO
 #include <SFML/Audio.hpp>
 #endif
 
@@ -83,7 +83,7 @@ class RecordingBackendSoundClick : public RecordingBackend
   // NEST Stopwatch object
   Stopwatch stopwatch_;
 
-#if defined( HAVE_SFML_AUDIO )
+#ifdef HAVE_SFML_AUDIO
   sf::SoundBuffer sound_buffer_;
   sf::Sound sound_;
 #endif