diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/plugin.c | 2 | ||||
| -rw-r--r-- | apps/plugin.h | 2 | ||||
| -rw-r--r-- | apps/plugins/lua/include_lua/pcm.lua | 2 | ||||
| -rw-r--r-- | apps/plugins/lua/rocklib.c | 15 |
4 files changed, 4 insertions, 17 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index 4a50c2b3a3..584fbf1ab3 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -602,8 +602,6 @@ static const struct plugin_api rockbox_api = { pcm_play_stop, pcm_set_frequency, pcm_is_playing, - pcm_is_paused, - pcm_play_pause, pcm_get_bytes_waiting, pcm_calculate_peaks, pcm_get_peak_buffer, diff --git a/apps/plugin.h b/apps/plugin.h index 395caaddc0..c2538b0cf5 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -677,8 +677,6 @@ struct plugin_api { void (*pcm_play_stop)(void); void (*pcm_set_frequency)(unsigned int frequency); bool (*pcm_is_playing)(void); - bool (*pcm_is_paused)(void); - void (*pcm_play_pause)(bool play); size_t (*pcm_get_bytes_waiting)(void); void (*pcm_calculate_peaks)(int *left, int *right); const void* (*pcm_get_peak_buffer)(int *count); diff --git a/apps/plugins/lua/include_lua/pcm.lua b/apps/plugins/lua/include_lua/pcm.lua index 6b2b6db204..46cc5b0720 100644 --- a/apps/plugins/lua/include_lua/pcm.lua +++ b/apps/plugins/lua/include_lua/pcm.lua @@ -26,11 +26,9 @@ if not rb.pcm then rb.splash(rb.HZ, "No Support!") return nil end rb.pcm_apply_settings = function() rb.pcm("apply_settings") end rb.pcm_set_frequency = function(freq) rb.pcm("set_frequency", freq) end -rb.pcm_play_pause = function(bplay) rb.pcm("play_pause", bplay) end rb.pcm_play_stop = function() rb.pcm("play_stop") end rb.pcm_play_lock = function() rb.pcm("play_lock") end rb.pcm_play_unlock = function() rb.pcm("play_unlock") end rb.pcm_is_playing = function() return rb.pcm("is_playing") end -rb.pcm_is_paused = function() return rb.pcm("is_paused") end rb.pcm_calculate_peaks = function() return rb.pcm("calculate_peaks") end rb.pcm_get_bytes_waiting = function() return rb.pcm("get_bytes_waiting") end diff --git a/apps/plugins/lua/rocklib.c b/apps/plugins/lua/rocklib.c index 8921c0a4c3..6219bb2e5a 100644 --- a/apps/plugins/lua/rocklib.c +++ b/apps/plugins/lua/rocklib.c @@ -519,12 +519,12 @@ RB_WRAP(sound) RB_WRAP(pcm) { - enum e_pcm {PCM_APPLYSETTINGS = 0, PCM_ISPLAYING, PCM_ISPAUSED, - PCM_PLAYSTOP, PCM_PLAYPAUSE, PCM_PLAYLOCK, PCM_PLAYUNLOCK, + enum e_pcm {PCM_APPLYSETTINGS = 0, PCM_ISPLAYING, + PCM_PLAYSTOP, PCM_PLAYLOCK, PCM_PLAYUNLOCK, PCM_CALCULATEPEAKS, PCM_SETFREQUENCY, PCM_GETBYTESWAITING, PCM_ECOUNT}; - const char *pcm_option[] = {"apply_settings", "is_playing", "is_paused", - "play_stop", "play_pause", "play_lock", "play_unlock", + const char *pcm_option[] = {"apply_settings", "is_playing", + "play_stop", "play_lock", "play_unlock", "calculate_peaks", "set_frequency", "get_bytes_waiting", NULL}; bool b_result; int left, right; @@ -542,13 +542,6 @@ RB_WRAP(pcm) b_result = rb->pcm_is_playing(); lua_pushboolean(L, b_result); break; - case PCM_ISPAUSED: - b_result = rb->pcm_is_paused(); - lua_pushboolean(L, b_result); - break; - case PCM_PLAYPAUSE: - rb->pcm_play_pause(luaL_checkboolean(L, 2)); - break; case PCM_PLAYSTOP: rb->pcm_play_stop(); break; |