From 9b385f37efde877b77be2e0c1822a52b495ad4e6 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Thu, 1 Nov 2018 18:18:46 -0400 Subject: Lua fix dir string constants and pcm_play_pause & pcm_set_frequency String constants were already expanded in the first macro pcm functions were looking for stack position #1 when they needed stack pos #2 Change-Id: I7b4fb90953ab2395b77cbd550fdd257fafca6aae --- apps/plugins/lua/rocklib.c | 4 ++-- apps/plugins/lua/rocklib.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/lua/rocklib.c b/apps/plugins/lua/rocklib.c index ed625ca369..44eb549dae 100644 --- a/apps/plugins/lua/rocklib.c +++ b/apps/plugins/lua/rocklib.c @@ -363,7 +363,7 @@ RB_WRAP(pcm) lua_pushboolean(L, b_result); break; case PCM_PLAYPAUSE: - rb->pcm_play_pause(luaL_checkboolean(L, 1)); + rb->pcm_play_pause(luaL_checkboolean(L, 2)); break; case PCM_PLAYSTOP: rb->pcm_play_stop(); @@ -380,7 +380,7 @@ RB_WRAP(pcm) lua_pushinteger(L, right); return 2; case PCM_SETFREQUENCY: - rb->pcm_set_frequency((unsigned int) luaL_checkint(L, 1)); + rb->pcm_set_frequency((unsigned int) luaL_checkint(L, 2)); break; case PCM_GETBYTESWAITING: byteswait = rb->pcm_get_bytes_waiting(); diff --git a/apps/plugins/lua/rocklib.h b/apps/plugins/lua/rocklib.h index 4714dec36d..c8d1366ba6 100644 --- a/apps/plugins/lua/rocklib.h +++ b/apps/plugins/lua/rocklib.h @@ -33,7 +33,7 @@ #endif #define RB_CONSTANT(x) {#x, x} -#define RB_STRING_CONSTANT(x) RB_CONSTANT(x) +#define RB_STRING_CONSTANT(x) {#x, x} struct lua_int_reg { char const* name; -- cgit