vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some fixes so basic_example builds on Win32

Browse Source
This commit is contained in:
Daniel Collin 2013-07-01 10:56:46 +02:00
parent ab20103966
commit 37db37bf1d
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ogl_editor/basic_example/basic_example.c
View File

@ -1,6 +1,10 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#if defined(WIN32)
#include <windows.h>
#else
#include <unistd.h> #include <unistd.h>
#endif
#include "../../sync/sync.h" #include "../../sync/sync.h"
static struct sync_device *device; static struct sync_device *device;
@ -12,7 +16,7 @@ static struct sync_cb cb;
const float bpm = 180.0f; const float bpm = 180.0f;
const float rpb = 8.0f; const float rpb = 8.0f;
const float rps = bpm / 60.0f * rpb; float rps = 24.0f;// bpm / 60.0f * rpb; <- msvc cant compute this compile time... sigh
int audio_is_playing = 1; int audio_is_playing = 1;
int curtime_ms = 0; int curtime_ms = 0;
@ -20,7 +24,7 @@ int curtime_ms = 0;
static int row_to_ms_round(int row, float rps) static int row_to_ms_round(int row, float rps)
{ {
const double newtime = ((float)(row)) / rps; const float newtime = ((float)(row)) / rps;
return (int)(floor(newtime * 1000.0f + 0.5f)); return (int)(floor(newtime * 1000.0f + 0.5f));
} }
@ -28,7 +32,7 @@ static int row_to_ms_round(int row, float rps)
static float ms_to_row_f(int time_ms, float rps) static float ms_to_row_f(int time_ms, float rps)
{ {
const double row = rps * ((float)time_ms) * 1.0f/1000.0f; const float row = rps * ((float)time_ms) * 1.0f/1000.0f;
return row; return row;
} }
@ -58,9 +62,9 @@ static void xpause(void* data, int flag)
static void xset_row(void* data, int row) static void xset_row(void* data, int row)
{ {
(void)data;
int newtime_ms = row_to_ms_round(row, rps); int newtime_ms = row_to_ms_round(row, rps);
curtime_ms = newtime_ms; curtime_ms = newtime_ms;
(void)data;
} }
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -158,8 +162,11 @@ int main()
for (i = 0; i < sizeof_array(s_trackNames); ++i) for (i = 0; i < sizeof_array(s_trackNames); ++i)
printf("%s %f\n", s_trackNames[i], sync_get_val(s_tracks[i], row_f)); printf("%s %f\n", s_trackNames[i], sync_get_val(s_tracks[i], row_f));
#if defined(WIN32)
Sleep(16);
#else
usleep(16000); usleep(16000);
#endif
} }
} }

3
ogl_editor/units.lua
View File

@ -121,6 +121,9 @@ Program {
Name = "basic_example", Name = "basic_example",
Sources = { "basic_example/basic_example.c" }, Sources = { "basic_example/basic_example.c" },
Depends = { "sync" }, Depends = { "sync" },
Libs = {
{ "wsock32.lib"; Config = "win32-*-*" },
},
} }
local rocketBundle = OsxBundle local rocketBundle = OsxBundle