Skip to content

Commit 95b65b5

Browse files
bill-augerbill-auger
committed
redirect windows output to file and consolidate build scripts
1 parent 5e5d17c commit 95b65b5

File tree

10 files changed

+106
-117
lines changed

10 files changed

+106
-117
lines changed

‎README-MINGW.md

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,27 @@ download and extract SDL-mingw , SDL_gfx , SDL_ttf tarballs
66
e.g. SDL-devel-1.2.15-mingw32.tar.gz
77
SDL_gfx-2.0.25.tar.gz
88
SDL_ttf-devel-2.0.11-VC.zip (pre-bult binaries)
9-
compile and install SDL and SDL_gfx libs
10-
copy headers to system include dir
11-
```
12-
TODO: only the SDL_ttf files must be manually copied if using pre-bult binaries
13-
TODO: this must be borked
14-
/usr/include/ is /c/MinGW/msys/1.0/include
15-
sdl headers must be in /c/MinGW/msys/1.0/include
16-
but jack headers must be in /c/MinGW/include
9+
compile and install SDL, SDL_gfx, and SDL_ttf libs
10+
workaround if system dirs are borked - e.g.
11+
* /usr/include/ is /c/MinGW/msys/1.0/include
12+
* sdl headers must be in /c/MinGW/msys/1.0/include
13+
* but jack headers must be in /c/MinGW/include
14+
```bash
1715
$ cp -rf /usr/include/* /c/MinGW/include/
1816
$ rm -rf /usr/include/
1917
$ ln -s /c/MinGW/include /usr/include
18+
```
19+
copy any pre-built libs and headers to system dirs
20+
```bash
2021
$ cp /c/Program\ Files/Jack/includes/jack /usr/include/
2122
$ cp /c/src/sdl/SDL-1.2.15/include/SDL/SDL.h /usr/include/SDL/
2223
$ cp /c/src/sdl/SDL_gfx-2.0.25/SDL_gfxPrimitives.h /usr/include/SDL/
2324
$ cp /c/src/sdl/SDL_gfx-2.0.25/SDL_rotozoom.h /usr/include/SDL/
2425
$ cp /c/src/sdl/SDL_ttf-2.0.11/include/SDL_ttf.h /usr/include/SDL/
2526
```
2627
copy static libs to system lib dir
27-
```
28+
```bash
2829
$ cp /c/Program\ Files/Jack/lib/libjack.lib /usr/lib/
2930
$ cp /c/src/sdl/SDL_gfx-2.0.25/Release/SDL_gfx.lib /usr/lib/
3031
$ cp /c/src/sdl/SDL_ttf-2.0.11/lib/x86/SDL_ttf.lib /usr/lib/
3132
```
32-
copy assets to build bin dirs
33-
```
34-
$ cp ./assets/* ./build/bin/Debug/
35-
$ cp ./assets/* ./build/bin/Release
36-
```
37-
copy dynamic libs to build bin dirs
38-
```
39-
$ cp /c/src/sdl/SDL-1.2.15/lib/x86/SDL.dll ./build/bin/Debug/
40-
$ cp /c/src/sdl/SDL_gfx-2.0.25/Release/SDL_gfx.dll ./build/bin/Debug/
41-
$ cp /c/src/sdl/SDL_ttf-2.0.11/lib/x86/SDL_ttf.dll ./build/bin/Debug/
42-
$ cp /c/src/sdl/SDL_ttf-2.0.11/lib/x86/libfreetype-6.dll ./build/bin/Debug/
43-
$ cp ./build/bin/Debug/*.dll ./build/bin/Release
44-
```
45-
compile like:
46-
```
47-
$ cd build
48-
$ MINGW=1 make
49-
```

‎README.md

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,35 @@
1-
### This is Loopidity *- A multitrack looping audio recorder for GNU/Linux designed for live handsfree use*
2-
| build | status |
3-
| ---------- | ------ |
4-
| linux | [![Build Status](https://travis-ci.org/bill-auger/loopidity.svg?branch=linux)](https://travis-ci.org/bill-auger/loopidity) |
5-
| windows | [![Build Status](https://travis-ci.org/bill-auger/loopidity.svg?branch=mingw)](https://travis-ci.org/bill-auger/loopidity) |
6-
| latest-dev | [![Build Status](https://travis-ci.org/bill-auger/loopidity.svg)](https://travis-ci.org/bill-auger/loopidity) |
1+
### This is Loopidity *- A multi-track, multi-channel, looping audio recorder for GNU/Linux and Windows - designed for live handsfree use*
2+
| build status: | linux [![linux build status][linux-img]][travis] | windows [![windows build status][windows-img]][travis] | latest-dev [![latest build status][latest-img]][travis] |
3+
| ------------- | ------------------------------------------------ | ------------------------------------------------------ | ------------------------------------------------------- |
74

85
#### build
96
* binaries coming soon - bake yer own for now
10-
* build requires libsdl1.2 , libSDL_gfx , libSDL_ttf and libjack2 (also X11 on *nix) devel libs
7+
* build requires libsdl1.2 , libSDL_gfx , libSDL_ttf and libjack2 (also X11 on *nix)
118
* compiler must support c++11 features
12-
* windows and code::blocks builds refer to [README-MINGW.md](https://github.com/bill-auger/loopidity/blob/master/README-MINGW.md)
13-
14-
build with gnu toolchain on a *nix
9+
* windows builds refer to [README-MINGW.md][README-MINGW]
10+
* build with gnu toolchain
1511
```bash
16-
$ cd build
17-
$ make
12+
$ cd build
13+
$ make release
14+
$ make debug
15+
$ make # [ all ]
1816
```
19-
build with gnu toolchain on windows
17+
* or compile, run/debug, and/or clean via helper script
2018
```bash
21-
$ cd build
22-
$ MINGW=1 make
19+
$ ./mk debug
20+
$ ./mk release
21+
$ ./mk debug clean
22+
$ ./mk release clean
2323
```
24-
build with code::blocks
24+
* build with code::blocks
2525
```bash
2626
$ cd build
2727
$ codeblocks loopidity.cbp
2828
```
29+
30+
31+
[linux-img]: https://travis-ci.org/bill-auger/loopidity.svg?branch=linux
32+
[windows-img]: https://travis-ci.org/bill-auger/loopidity.svg?branch=mingw
33+
[latest-img]: https://travis-ci.org/bill-auger/loopidity.svg
34+
[travis]: https://travis-ci.org/bill-auger/loopidity
35+
[README-MINGW]: https://github.com/bill-auger/loopidity/blob/master/README-MINGW.md

‎build/Makefile

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2+
ifeq (${MSYSTEM} , MINGW32)
3+
MINGW = 1
4+
endif
5+
26
WORKDIR = `pwd`
37

48
CC = gcc
@@ -47,8 +51,6 @@ OUT_RELEASE = $(BINDIR_RELEASE)/loopidity
4751
ASSETS_DIR = ../assets
4852
ifdef MINGW
4953
SYSBIN_DIR = /usr/bin
50-
else
51-
SYSBIN_DIR = /usr/bin
5254
endif
5355

5456
OBJ_DEBUG = $(OBJDIR_DEBUG)/__/src/jack_io.o \
@@ -69,15 +71,6 @@ ASSETS = histogram_gradient.bmp \
6971
loop_gradient.argb.bmp \
7072
scope_gradient.bmp \
7173
Purisa.ttf
72-
ifdef MINGW
73-
WINLIBS = SDL.dll \
74-
SDL_gfx.dll \
75-
SDL_ttf.dll \
76-
libfreetype-6.dll \
77-
zlib1.dll
78-
else
79-
WINLIBS =
80-
endif
8174

8275

8376
all: debug release
@@ -141,13 +134,4 @@ $(ASSETS):
141134
cp $(ASSETS_DIR)/$@ $(BINDIR_RELEASE)/$@ )
142135

143136

144-
$(WINLIBS):
145-
@[ ! -d $(BINDIR_DEBUG) ] || [ -f $(BINDIR_DEBUG)/$@ ] || \
146-
( echo "copying asset to debug bin directory: '$@'" ; \
147-
cp $(SYSBIN_DIR)/$@ $(BINDIR_DEBUG)/$@ )
148-
@[ ! -d $(BINDIR_RELEASE) ] || [ -f $(BINDIR_RELEASE)/$@ ] || \
149-
( echo "copying asset to release bin directory: '$@'" ; \
150-
cp $(SYSBIN_DIR)/$@ $(BINDIR_RELEASE)/$@ )
151-
152-
153137
.PHONY: before_debug after_debug clean_debug before_release after_release clean_release

‎mk

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
11
#!/bin/bash
22

3-
echo $COMSPEC | grep WINDOWS > /dev/null
4-
IS_NOT_WINDOWS=$?
3+
4+
if [ "$1" == "debug" ]
5+
then TARGET=debug ; BIN_DIR=./bin/Debug ; CMD="gdb ./loopidity-dbg" ;
6+
else TARGET=release ; BIN_DIR=./bin/Release ; CMD=" ./loopidity" ;
7+
fi
8+
[ "$1" == "clean" -o "$2" == "clean" ] && SHOULD_CLEAN=1
59
ROOT_DIR=`pwd`
10+
LOG_FILE="debug.log"
611

712

8-
if (($IS_NOT_WINDOWS))
9-
then cd build && make release && cd bin/Release/ && ./loopidity
10-
else cd build && MINGW=1 make release && cd bin/Release/ && ./loopidity.exe
11-
fi
13+
trace() { echo ; echo $* ; }
14+
15+
16+
cd build
17+
(($SHOULD_CLEAN)) && trace "cleaning $TARGET build" && make clean
18+
19+
make $TARGET || exit
20+
21+
trace "launching executable"
22+
cd $BIN_DIR ; $CMD ;
23+
24+
trace "executable terminated"
25+
[ -f $LOG_FILE ] && trace "$LOG_FILE -->" && cat $LOG_FILE
1226
cd $ROOT_DIR

‎mk-clean

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎mk-dbg

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/jack_io.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ DEBUG_TRACE_JACK_INIT
172172
!(InputPort2 = RegisterPort(JACK_INPUT2_PORT_NAME , JackPortIsInput)) ||
173173
!(OutputPort1 = RegisterPort(JACK_OUTPUT1_PORT_NAME , JackPortIsOutput)) ||
174174
!(OutputPort2 = RegisterPort(JACK_OUTPUT2_PORT_NAME , JackPortIsOutput)) ||
175-
jack_activate(Client)) return JACK_FAIL ;
175+
jack_activate(Client)) return JACK_HW_FAIL ;
176176
#endif // #if INIT_JACK_BEFORE_SCENES
177177

178178
// propogate server state

‎src/loopidity.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ bool Loopidity::IsEditMode = false ;
5959

6060
int Loopidity::Main(int argc , char** argv)
6161
{
62-
DEBUG_TRACE_LOOPIDITY_MAIN_IN
63-
6462
// 'singleton' sanity check
6563
if (IsInitialized()) return false ;
6664

@@ -202,20 +200,19 @@ bool Loopidity::Init(bool shouldMonitorInputs , bool shouldAutoSceneChange ,
202200
// instantiate Scenes (models) and SdlScenes (views)
203201
for (Uint32 sceneN = 0 ; sceneN < N_SCENES ; ++sceneN)
204202
{
205-
#if INIT_JACK_BEFORE_SCENES
206203
try
207204
{
205+
#if INIT_JACK_BEFORE_SCENES
208206
Scenes [sceneN] = new Scene(sceneN) ;
209207
SdlScenes[sceneN] = new SceneSdl(Scenes[sceneN]) ;
210-
}
211-
catch(exception& ex) { LoopiditySdl::Alert(ex.what()) ; return false ; }
212208
#else
213-
Scenes [sceneN] = new Scene(sceneN , JackIO::GetRecordBufferSize()) ;
214-
SdlScenes[sceneN] = new SceneSdl(Scenes[sceneN]) ;
209+
Scenes [sceneN] = new Scene(sceneN , JackIO::GetRecordBufferSize()) ;
210+
SdlScenes[sceneN] = new SceneSdl(Scenes[sceneN]) ;
215211
#endif // #if INIT_JACK_BEFORE_SCENES
216-
UpdateView(sceneN) ;
212+
}
213+
catch(exception& ex) { LoopiditySdl::Alert(ex.what()) ; return false ; }
217214

218-
if (!Scenes[sceneN] || !SdlScenes[sceneN]) return false ;
215+
UpdateView(sceneN) ;
219216
}
220217

221218
#if INIT_JACK_BEFORE_SCENES

‎src/main.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,23 @@ JackIO - JACK wrapper class (== 0 instances)
1010
Trace - debug trace class (== 0 instances)
1111
*/
1212

13+
14+
#ifdef _WIN32
15+
# include <fstream>
16+
#endif // _WIN32
17+
1318
#include "loopidity.h"
1419

1520

1621
/* entry point */
1722

1823
int main(int argc , char** argv)
1924
{
25+
DEBUG_TRACE_MAIN_IN
26+
2027
int exitStatus = Loopidity::Main(argc , argv) ; Loopidity::Cleanup() ;
2128

22-
#if DEBUG_TRACE
23-
if (!!exitStatus) ERR(INIT_FAIL_MSG) ;
24-
#endif
29+
DEBUG_TRACE_MAIN_OUT
2530

2631
return exitStatus ;
2732
}

‎src/trace.h

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@
2828
#define TRACE_IN Trace::TraceIn
2929
#define TRACE_OUT Trace::TraceOut
3030
#define TRACE_SCENE Trace::TraceScene
31-
#if DEBUG_TRACE_JACK //|| 1
32-
# define DEBUG_TRACE_JACK_INIT printf("JackIO::Init() shouldMonitorInputs=%d recordBufferSize=%d\n" , shouldMonitorInputs , recordBufferSize) ;
33-
# define DEBUG_TRACE_JACK_RESET printf("JackIO::Reset() sceneN=%d\n" , currentScene->sceneN) ;
34-
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_IN ; // Uint32 DbgNextFrameN = (CurrentScene->currentFrameN + nFramesPerPeriod) ; if (DbgNextFrameN >= CurrentScene->endFrameN || !(DbgNextFrameN % 32768)) printf("JackIO::ProcessCallback() sceneN=%d currentFrameN=%d nFramesPerPeriod=%d CurrentScene->endFrameN=%d mod=%d\n" , CurrentScene->sceneN , CurrentScene->currentFrameN , nFramesPerPeriod , CurrentScene->endFrameN , ((CurrentScene->currentFrameN + nFramesPerPeriod) % CurrentScene->endFrameN)) ;
35-
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_ROLLOVER printf("JackIO::ProcessCallback() buffer rollover nLoops=%d isBaseLoop=%d beginFrameN=%d endFrameN=%d nSeconds=%d - %s\n" , nLoops , isBaseLoop , beginFrameN , endFrameN , (nFrames / SampleRate) , ((!isBaseLoop)? "" : ((endFrameN == EndFrameN)? "endFrameN invalid" : ((nFrames < MinLoopSize)? "nFrames invalid" : "valid")))) ;
36-
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_NEW_LOOP printf("JackIO::ProcessCallback() NewLoop isBaseLoop=%d\n" , isBaseLoop) ;
37-
# define DEBUG_TRACE_JACK_SETMETADATA printf("JackIO::SetMetadata() SampleRate=%d nFramesPerPeriod=%d BeginFrameN=%d EndFrameN=%d modsane=%d\n" , SampleRate , nFramesPerPeriod , BeginFrameN , EndFrameN , (!(BeginFrameN % nFramesPerPeriod) && !(EndFrameN % nFramesPerPeriod))) ;
31+
32+
#if DEBUG_TRACE
33+
# ifdef _WIN32
34+
# define REDIRECT_WINDOWS_OUTPUT std::ofstream ofs("debug.log") ; cout.rdbuf(ofs.rdbuf()) ;
35+
# else // _WIN32
36+
# define REDIRECT_WINDOWS_OUTPUT ;
37+
# endif // _WIN32
38+
# define DEBUG_TRACE_MAIN_IN REDIRECT_WINDOWS_OUTPUT if (DEBUG_TRACE_EVS) DBG(INIT_MSG) ;
39+
# define DEBUG_TRACE_MAIN_OUT if (!!exitStatus) ERR(INIT_FAIL_MSG) ;
3840
#else
39-
# define DEBUG_TRACE_JACK_INIT ;
40-
# define DEBUG_TRACE_JACK_RESET ;
41-
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_IN ;
42-
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_ROLLOVER ;
43-
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_NEW_LOOP ;
44-
# define DEBUG_TRACE_JACK_SETMETADATA ;
45-
#endif // #if DEBUG_TRACE_JACK
41+
# define DEBUG_TRACE_MAIN_IN ;
42+
# define DEBUG_TRACE_MAIN_OUT ;
43+
#endif
44+
4645
#if DEBUG_TRACE_LOOPIDITY
47-
# define DEBUG_TRACE_LOOPIDITY_MAIN_IN if (DEBUG_TRACE_EVS) printf("%s\n" , INIT_MSG) ;
4846
# define DEBUG_TRACE_LOOPIDITY_MAIN_MID if (DEBUG_TRACE_EVS) printf("%s\n" , INIT_SUCCESS_MSG) ;
4947
# define DEBUG_TRACE_LOOPIDITY_MAIN_OUT if (DEBUG_TRACE_EVS) printf("%s\n" , EXIT_SUCCESS_MSG) ;
5048
# define DEBUG_TRACE_LOOPIDITY_TOGGLERECORDINGSTATE_IN if (TRACE_EVS(CurrentSceneN)) printf("\nUSER: SDLK_SPACE --> Loopidity::ToggleRecordingState(%d)\n\n" , CurrentSceneN) ; if (TRACE_IN(CurrentSceneN) && !TRACE_SCENE("Loopidity::ToggleRecordingState(%d) IN" , Scenes[CurrentSceneN])) return ;
@@ -69,7 +67,6 @@
6967
# define DEBUG_TRACE_LOOPIDITY_ONSCENECHANGE_OUT if (TRACE_OUT(NextSceneN)) TRACE_SCENE("Loopidity::OnSceneChange(%d) OUT" , nextScene) ;
7068
# define DEBUG_TRACE_LOOPIDITY_OOM_IN TRACE_SCENE("Loopidity::OOM(%d) IN" , Scenes[CurrentSceneN]) ;
7169
#else
72-
# define DEBUG_TRACE_LOOPIDITY_MAIN_IN ;
7370
# define DEBUG_TRACE_LOOPIDITY_MAIN_MID ;
7471
# define DEBUG_TRACE_LOOPIDITY_MAIN_OUT ;
7572
# define DEBUG_TRACE_LOOPIDITY_TOGGLERECORDINGSTATE_IN ;
@@ -94,11 +91,29 @@
9491
# define DEBUG_TRACE_LOOPIDITY_ONSCENECHANGE_OUT ;
9592
# define DEBUG_TRACE_LOOPIDITY_OOM_IN ;
9693
#endif // #if DEBUG_TRACE_LOOPIDITY
94+
95+
#if DEBUG_TRACE_JACK
96+
# define DEBUG_TRACE_JACK_INIT printf("JackIO::Init() shouldMonitorInputs=%d recordBufferSize=%d\n" , shouldMonitorInputs , recordBufferSize) ;
97+
# define DEBUG_TRACE_JACK_RESET printf("JackIO::Reset() sceneN=%d\n" , currentScene->sceneN) ;
98+
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_IN ; // Uint32 DbgNextFrameN = (CurrentScene->currentFrameN + nFramesPerPeriod) ; if (DbgNextFrameN >= CurrentScene->endFrameN || !(DbgNextFrameN % 32768)) printf("JackIO::ProcessCallback() sceneN=%d currentFrameN=%d nFramesPerPeriod=%d CurrentScene->endFrameN=%d mod=%d\n" , CurrentScene->sceneN , CurrentScene->currentFrameN , nFramesPerPeriod , CurrentScene->endFrameN , ((CurrentScene->currentFrameN + nFramesPerPeriod) % CurrentScene->endFrameN)) ;
99+
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_ROLLOVER printf("JackIO::ProcessCallback() buffer rollover nLoops=%d isBaseLoop=%d beginFrameN=%d endFrameN=%d nSeconds=%d - %s\n" , nLoops , isBaseLoop , beginFrameN , endFrameN , (nFrames / SampleRate) , ((!isBaseLoop)? "" : ((endFrameN == EndFrameN)? "endFrameN invalid" : ((nFrames < MinLoopSize)? "nFrames invalid" : "valid")))) ;
100+
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_NEW_LOOP printf("JackIO::ProcessCallback() NewLoop isBaseLoop=%d\n" , isBaseLoop) ;
101+
# define DEBUG_TRACE_JACK_SETMETADATA printf("JackIO::SetMetadata() SampleRate=%d nFramesPerPeriod=%d BeginFrameN=%d EndFrameN=%d modsane=%d\n" , SampleRate , nFramesPerPeriod , BeginFrameN , EndFrameN , (!(BeginFrameN % nFramesPerPeriod) && !(EndFrameN % nFramesPerPeriod))) ;
102+
#else
103+
# define DEBUG_TRACE_JACK_INIT ;
104+
# define DEBUG_TRACE_JACK_RESET ;
105+
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_IN ;
106+
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_ROLLOVER ;
107+
# define DEBUG_TRACE_JACK_PROCESS_CALLBACK_NEW_LOOP ;
108+
# define DEBUG_TRACE_JACK_SETMETADATA ;
109+
#endif // #if DEBUG_TRACE_JACK
110+
97111
#if DEBUG_TRACE_LOOPIDITYSDL
98112
# define DEBUG_TRACE_LOOPIDITYSDL_HANDLEKEYEVENT if (DEBUG_TRACE_EVS) switch (event->key.keysym.sym) { case SDLK_SPACE: printf("\nKEY: SDLK_SPACE\n") ; break ; case SDLK_KP0: printf("\nKEY: SDLK_KP0\n") ; break ; case SDLK_KP_ENTER: printf("\nKEY: SDLK_KP_ENTER\n") ; break ; case SDLK_ESCAPE: printf("\nKEY: SDLK_ESCAPE\n") ; break ; default: break ; }
99113
#else
100114
# define DEBUG_TRACE_LOOPIDITYSDL_HANDLEKEYEVENT ;
101115
#endif // #if DEBUG_TRACE_LOOPIDITYSDL
116+
102117
#if DEBUG_TRACE_SCENE
103118
# define DEBUG_TRACE_SCENE_BEGINRECORDING_IN if (TRACE_IN(sceneN) && !TRACE_SCENE("Scene::beginRecording(%d) IN" , this)) return ; ;
104119
# define DEBUG_TRACE_SCENE_TOGGLERECORDINGSTATE_IN if (TRACE_IN(sceneN) && !TRACE_SCENE("Scene::toggleRecordingState(%d) IN" , this)) return ;
@@ -128,6 +143,7 @@
128143
# define DEBUG_TRACE_SCENE_RESCANPEAKS_IN ;
129144
# define DEBUG_TRACE_SCENE_RESCANPEAKS_OUT ;
130145
#endif // #if DEBUG_TRACE_SCENE
146+
131147
#if DEBUG_TRACE_SCENESDL
132148
# define DEBUG_TRACE_SCENESDL_UPDATESTATUS_IN if (TRACE_IN(scene->sceneN)) TRACE_SCENE("SceneSdl::updateState(%d) IN" , scene) ;
133149
# define DEBUG_TRACE_SCENESDL_UPDATESTATUS_OUT if (TRACE_OUT(scene->sceneN)) TRACE_SCENE("SceneSdl::updateState(%d) OUT" , scene) ;
@@ -144,7 +160,8 @@
144160
# define DEBUG_TRACE_SCENESDL_DELETELOOP_OUT ;
145161
#endif // #if DEBUG_TRACE_SCENESDL
146162

147-
#define INIT_MSG "Loopidity::Main(): init"
163+
164+
#define INIT_MSG "main(): init"
148165
#define INIT_SUCCESS_MSG "Loopidity::Main(): init success - entering sdl loop"
149166
#define INIT_FAIL_MSG "Loopidity::Main(): init failed - quitting"
150167
#define GETPEAK_ERROR_MSG "Loopidity::GetPeak(): subscript out of range"

0 commit comments

Comments
 (0)