aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Berger <j.david.berger@gmail.com>2018-03-24 10:03:43 -0600
committerJustin Berger <j.david.berger@gmail.com>2018-03-24 10:03:43 -0600
commitb45e58d9f75747e8727ac6cd0594a921e945c7e2 (patch)
tree8f15f7cd6a39357fd6e0994e21d1c0f19017ba75
parent0d323e4a42bcfa70150c77f45f6f465f84666e31 (diff)
downloadlibsurvive-b45e58d9f75747e8727ac6cd0594a921e945c7e2.tar.gz
libsurvive-b45e58d9f75747e8727ac6cd0594a921e945c7e2.tar.bz2
Fixed issue(s) which would write to the config file when it wasn't needed
-rw-r--r--data_recorder.c2
-rw-r--r--src/survive_playback.c8
-rwxr-xr-xsrc/survive_vive.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/data_recorder.c b/data_recorder.c
index 427a953..968ae17 100644
--- a/data_recorder.c
+++ b/data_recorder.c
@@ -11,7 +11,7 @@ int main(int argc, char **argv) {
if (ctx == 0) // implies -help or similiar
return 0;
- const char *dataout_file = survive_configs(ctx, "record", SC_SETCONFIG, "");
+ const char *dataout_file = survive_configs(ctx, "record", SC_GET, "");
if (strlen(dataout_file) == 0) {
survive_configi(ctx, "record-stdout", SC_SET | SC_OVERRIDE, 1);
}
diff --git a/src/survive_playback.c b/src/survive_playback.c
index 172614b..e4321bc 100644
--- a/src/survive_playback.c
+++ b/src/survive_playback.c
@@ -342,8 +342,8 @@ static int playback_close(struct SurviveContext *ctx, void *_driver) {
}
void survive_install_recording(SurviveContext *ctx) {
- const char *dataout_file = survive_configs(ctx, "record", SC_SETCONFIG, "");
- int record_to_stdout = survive_configi(ctx, "record-stdout", SC_SETCONFIG, 0);
+ const char *dataout_file = survive_configs(ctx, "record", SC_GET, "");
+ int record_to_stdout = survive_configi(ctx, "record-stdout", SC_GET, 0);
if (strlen(dataout_file) > 0 || record_to_stdout) {
ctx->recptr = calloc(1, sizeof(struct SurviveRecordingData));
@@ -366,7 +366,7 @@ void survive_install_recording(SurviveContext *ctx) {
}
int DriverRegPlayback(SurviveContext *ctx) {
- const char *playback_file = survive_configs(ctx, "playback", SC_SETCONFIG, "");
+ const char *playback_file = survive_configs(ctx, "playback", SC_GET, "");
if (strlen(playback_file) == 0) {
return 0;
@@ -375,7 +375,7 @@ int DriverRegPlayback(SurviveContext *ctx) {
SurvivePlaybackData *sp = calloc(1, sizeof(SurvivePlaybackData));
sp->ctx = ctx;
sp->playback_dir = playback_file;
- sp->time_factor = survive_configf(ctx, "playback-factor", SC_SETCONFIG, 1.f);
+ sp->time_factor = survive_configf(ctx, "playback-factor", SC_GET, 1.f);
printf("%s\n", playback_file);
diff --git a/src/survive_vive.c b/src/survive_vive.c
index d431207..91f25af 100755
--- a/src/survive_vive.c
+++ b/src/survive_vive.c
@@ -1720,7 +1720,7 @@ void init_SurviveObject(SurviveObject* so) {
int DriverRegHTCVive( SurviveContext * ctx )
{
- const char *playback_dir = survive_configs(ctx, "playback", SC_SETCONFIG, "");
+ const char *playback_dir = survive_configs(ctx, "playback", SC_GET, "");
if(strlen(playback_dir) != 0) {
SV_INFO("Playback is active; disabling USB driver");
return 0;