lua add audio_play consolidate audio_ functions

audio_play was removed from the rocklib I assume due to inconsistent
behavior I've readded it with a check for audio paused which instead
uses rewind/ff and then resumes audio

the way to call the audio functions has changed as well
rb.audio("option", var)
so rb.audio_play(0, 0) becomes rb.audio("play", 0, 0)
audio_audio_flush_and_reload_tracks becomes
rb.audio("flushandreloadtracks")

all functions except audio("getfilepos") return the previous (or still current)
status

added audio.lua to the includes for conversion to old functions
if your script is broken by this change you simply add `require("audio")`
to the top for the old functionality

Change-Id: I364adf0c85d9c12b98cde29c26fbe5ee05b9d331

1 files changed, 65 insertions, 0 deletions

diff --git a/apps/plugins/lua/rocklib.c b/apps/plugins/lua/rocklib.c
index 3f85da97a7..871336505c 100644
--- a/apps/plugins/lua/rocklib.c
+++ b/apps/plugins/lua/rocklib.c
@@ -320,6 +320,69 @@ RB_WRAP(playlist_insert_directory)
     return 1;
 }
 
+RB_WRAP(audio)
+{
+    enum e_audio {AUDIO_STATUS = 0, AUDIO_PLAY, AUDIO_STOP, AUDIO_PAUSE,
+                  AUDIO_RESUME, AUDIO_NEXT, AUDIO_PREV, AUDIO_FFREWIND,
+                  AUDIO_FLUSHANDRELOADTRACKS, AUDIO_GETPOS, AUDIO_ECOUNT};
+    const char *audio_option[] = {"status", "play", "stop", "pause",
+                                  "resume", "next", "prev", "ffrewind",
+                                  "flushandreloadtracks", "getfilepos", NULL};
+    long elapsed, offset, newtime;
+    int status = rb->audio_status();
+
+    int option = luaL_checkoption (L, 1, NULL, audio_option);
+    switch(option)
+    {
+        default:
+        case AUDIO_STATUS:
+            break;
+        case AUDIO_PLAY:
+            elapsed = luaL_checkint(L, 2);
+            offset  = luaL_checkint(L, 3);
+
+            if (status == (AUDIO_STATUS_PLAY | AUDIO_STATUS_PAUSE))
+            {
+                /* not perfect but provides a decent compromise */
+                rb->audio_ff_rewind(elapsed + offset);
+                rb->audio_resume();
+            }
+            else if (status != AUDIO_STATUS_PLAY)
+                rb->audio_play((unsigned long) elapsed, (unsigned long) offset);
+
+            break;
+        case AUDIO_STOP:
+            rb->audio_stop();
+            break;
+        case AUDIO_PAUSE:
+            rb->audio_pause();
+            break;
+        case AUDIO_RESUME:
+            rb->audio_resume();
+            break;
+        case AUDIO_NEXT:
+            rb->audio_next();
+            break;
+        case AUDIO_PREV:
+            rb->audio_prev();
+            break;
+        case AUDIO_FFREWIND:
+            newtime = (long) luaL_checkint(L, 2);
+            rb->audio_ff_rewind(newtime);
+            break;
+        case AUDIO_FLUSHANDRELOADTRACKS:
+            rb->audio_flush_and_reload_tracks();
+            break;
+        case AUDIO_GETPOS:
+            lua_pushinteger(L, rb->audio_get_file_pos());
+            return 1;
+    }
+
+    rb->yield();
+    lua_pushinteger(L, status); /* return previous (or current) audio status */
+    return 1;
+}
+
 SIMPLE_VOID_WRAPPER(backlight_force_on);
 SIMPLE_VOID_WRAPPER(backlight_use_settings);
 
@@ -449,6 +512,8 @@ static const luaL_Reg rocklib[] =
     RB_FUNC(strip_extension),
     RB_FUNC(create_numbered_filename),
 
+    RB_FUNC(audio),
+
     {NULL, NULL}
 };
 #undef RB_FUNC