2 files changed, 50 insertions, 4 deletions

diff --git a/apps/plugins/lib/mem_function_wrappers.h b/apps/plugins/lib/mem_function_wrappers.h
new file mode 100644
index 0000000000..ec3872c4c1
--- /dev/null
+++ b/apps/plugins/lib/mem_function_wrappers.h
@@ -0,0 +1,44 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2007 Nils Wallménius
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef __MEM_FUNCTION_WRAPPERS_H__
+#define __MEM_FUNCTION_WRAPPERS_H__
+
+/* Use this macro in plugins where gcc tries to optimize by calling
+ * these functions directly */
+
+#define MEM_FUNCTION_WRAPPERS(api) \
+        void *memcpy(void *dest, const void *src, size_t n) \
+        { \
+            return (api)->memcpy(dest, src, n); \
+        } \
+        void *memset(void *dest, int c, size_t n) \
+        { \
+            return (api)->memset(dest, c, n); \
+        } \
+        void *memmove(void *dest, const void *src, size_t n) \
+        { \
+            return (api)->memmove(dest, src, n); \
+        } \
+        int memcmp(const void *s1, const void *s2, size_t n) \
+        { \
+            return (api)->memcmp(s1, s2, n); \
+        }
+
+#endif /* __MEM_FUNCTION_WRAPPERS_H__ */
+
diff --git a/apps/plugins/lib/playback_control.c b/apps/plugins/lib/playback_control.c
index 34401e1d4f..177f26a417 100644
--- a/apps/plugins/lib/playback_control.c
+++ b/apps/plugins/lib/playback_control.c
@@ -65,10 +65,12 @@ static bool volume(void)
 
 static bool shuffle(void)
 {
-    struct opt_items names[] = {
-        { "No", -1 },
-        { "Yes", -1 }
-    };
+    struct opt_items names[2];
+        names[0].string = "No";
+        names[0].voice_id = -1;
+        names[1].string = "Yes";
+        names[1].voice_id = -1;
+
     return api->set_option("Shuffle", &api->global_settings->playlist_shuffle,
                            BOOL, names, 2,NULL);
 }