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 = { | |||
602 | pcm_play_stop, | 602 | pcm_play_stop, |
603 | pcm_set_frequency, | 603 | pcm_set_frequency, |
604 | pcm_is_playing, | 604 | pcm_is_playing, |
605 | pcm_is_paused, | ||
606 | pcm_play_pause, | ||
607 | pcm_get_bytes_waiting, | 605 | pcm_get_bytes_waiting, |
608 | pcm_calculate_peaks, | 606 | pcm_calculate_peaks, |
609 | pcm_get_peak_buffer, | 607 | 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 { | |||
677 | void (*pcm_play_stop)(void); | 677 | void (*pcm_play_stop)(void); |
678 | void (*pcm_set_frequency)(unsigned int frequency); | 678 | void (*pcm_set_frequency)(unsigned int frequency); |
679 | bool (*pcm_is_playing)(void); | 679 | bool (*pcm_is_playing)(void); |
680 | bool (*pcm_is_paused)(void); | ||
681 | void (*pcm_play_pause)(bool play); | ||
682 | size_t (*pcm_get_bytes_waiting)(void); | 680 | size_t (*pcm_get_bytes_waiting)(void); |
683 | void (*pcm_calculate_peaks)(int *left, int *right); | 681 | void (*pcm_calculate_peaks)(int *left, int *right); |
684 | const void* (*pcm_get_peak_buffer)(int *count); | 682 | 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 | |||
26 | 26 | ||
27 | rb.pcm_apply_settings = function() rb.pcm("apply_settings") end | 27 | rb.pcm_apply_settings = function() rb.pcm("apply_settings") end |
28 | rb.pcm_set_frequency = function(freq) rb.pcm("set_frequency", freq) end | 28 | rb.pcm_set_frequency = function(freq) rb.pcm("set_frequency", freq) end |
29 | rb.pcm_play_pause = function(bplay) rb.pcm("play_pause", bplay) end | ||
30 | rb.pcm_play_stop = function() rb.pcm("play_stop") end | 29 | rb.pcm_play_stop = function() rb.pcm("play_stop") end |
31 | rb.pcm_play_lock = function() rb.pcm("play_lock") end | 30 | rb.pcm_play_lock = function() rb.pcm("play_lock") end |
32 | rb.pcm_play_unlock = function() rb.pcm("play_unlock") end | 31 | rb.pcm_play_unlock = function() rb.pcm("play_unlock") end |
33 | rb.pcm_is_playing = function() return rb.pcm("is_playing") end | 32 | rb.pcm_is_playing = function() return rb.pcm("is_playing") end |
34 | rb.pcm_is_paused = function() return rb.pcm("is_paused") end | ||
35 | rb.pcm_calculate_peaks = function() return rb.pcm("calculate_peaks") end | 33 | rb.pcm_calculate_peaks = function() return rb.pcm("calculate_peaks") end |
36 | rb.pcm_get_bytes_waiting = function() return rb.pcm("get_bytes_waiting") end | 34 | 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) | |||
519 | 519 | ||
520 | RB_WRAP(pcm) | 520 | RB_WRAP(pcm) |
521 | { | 521 | { |
522 | enum e_pcm {PCM_APPLYSETTINGS = 0, PCM_ISPLAYING, PCM_ISPAUSED, | 522 | enum e_pcm {PCM_APPLYSETTINGS = 0, PCM_ISPLAYING, |
523 | PCM_PLAYSTOP, PCM_PLAYPAUSE, PCM_PLAYLOCK, PCM_PLAYUNLOCK, | 523 | PCM_PLAYSTOP, PCM_PLAYLOCK, PCM_PLAYUNLOCK, |
524 | PCM_CALCULATEPEAKS, PCM_SETFREQUENCY, PCM_GETBYTESWAITING, PCM_ECOUNT}; | 524 | PCM_CALCULATEPEAKS, PCM_SETFREQUENCY, PCM_GETBYTESWAITING, PCM_ECOUNT}; |
525 | 525 | ||
526 | const char *pcm_option[] = {"apply_settings", "is_playing", "is_paused", | 526 | const char *pcm_option[] = {"apply_settings", "is_playing", |
527 | "play_stop", "play_pause", "play_lock", "play_unlock", | 527 | "play_stop", "play_lock", "play_unlock", |
528 | "calculate_peaks", "set_frequency", "get_bytes_waiting", NULL}; | 528 | "calculate_peaks", "set_frequency", "get_bytes_waiting", NULL}; |
529 | bool b_result; | 529 | bool b_result; |
530 | int left, right; | 530 | int left, right; |
@@ -542,13 +542,6 @@ RB_WRAP(pcm) | |||
542 | b_result = rb->pcm_is_playing(); | 542 | b_result = rb->pcm_is_playing(); |
543 | lua_pushboolean(L, b_result); | 543 | lua_pushboolean(L, b_result); |
544 | break; | 544 | break; |
545 | case PCM_ISPAUSED: | ||
546 | b_result = rb->pcm_is_paused(); | ||
547 | lua_pushboolean(L, b_result); | ||
548 | break; | ||
549 | case PCM_PLAYPAUSE: | ||
550 | rb->pcm_play_pause(luaL_checkboolean(L, 2)); | ||
551 | break; | ||
552 | case PCM_PLAYSTOP: | 545 | case PCM_PLAYSTOP: |
553 | rb->pcm_play_stop(); | 546 | rb->pcm_play_stop(); |
554 | break; | 547 | break; |