Moved: Sound sources sample to sound sample directory

Added: CMake configuration for ogg vorbis stream source sample

code/nel/samples/CMakeLists.txt

@@ -17,5 +17,5 @@ IF(WITH_PACS)
 ENDIF(WITH_PACS)
 
 IF(WITH_SOUND)
-  ADD_SUBDIRECTORY(sound_sources)
+  ADD_SUBDIRECTORY(sound)
 ENDIF(WITH_SOUND)

code/nel/samples/sound/CMakeLists.txt

@@ -0,0 +1,4 @@
+
+ADD_SUBDIRECTORY(sound_sources)
+ADD_SUBDIRECTORY(stream_ogg_vorbis)
+

code/nel/samples/sound/sound_sources/CMakeLists.txt

@@ -7,7 +7,7 @@ ADD_DEFINITIONS(-DNL_SOUND_DATA="\\"${NL_SHARE_PREFIX}/nl_sample_sound/\\"" ${LI
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nl_sample_sound_sources nelmisc nelsound)
-NL_DEFAULT_PROPS(nl_sample_sound_sources "NeL, Samples: Sound System")
+NL_DEFAULT_PROPS(nl_sample_sound_sources "NeL, Samples: Sound: Sound Sources")
 NL_ADD_RUNTIME_FLAGS(nl_sample_sound_sources)
 
 INSTALL(TARGETS nl_sample_sound_sources RUNTIME DESTINATION bin COMPONENT samplessound)

code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt

@@ -0,0 +1,12 @@
+FILE(GLOB SRC *.cpp *.h)
+
+ADD_EXECUTABLE(nl_sample_stream_ogg_vorbis ${SRC})
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(nl_sample_stream_ogg_vorbis nelmisc nelsound)
+NL_DEFAULT_PROPS(nl_sample_stream_ogg_vorbis "NeL, Samples: Sound: Stream OGG Vorbis")
+NL_ADD_RUNTIME_FLAGS(nl_sample_sound_sources)
+
+INSTALL(TARGETS nl_sample_stream_ogg_vorbis RUNTIME DESTINATION bin COMPONENT samplessound)
+

code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp

@@ -48,7 +48,7 @@
 #define NL_SOUND_DATA "."
 #endif // NL_SOUND_DATA
 
-#define SAMPLE_OGG "O:/src/samples/music_stream/data/aeon_1_10_mystic_river.ogg"
+#define SAMPLE_OGG "D:/source/kaetemi/toverhex/src/samples/music_stream/data/aeon_1_10_mystic_river.ogg"
 
 using namespace std;
 using namespace NLMISC;
@@ -430,7 +430,7 @@ static void runSample()
 	
 	printf("End of song\n");
 	printf("Press ANY key to exit\n");
-	while (!_kbhit()) { s_AudioMixer->update(); Sleep(10); } _getch();
+	while (!_kbhit()) { s_AudioMixer->update(); nlSleep(10); } _getch();
 	return;
 }