[Commit-gnuradio] [gnuradio] 21/21: runtime: android: tweaking vmcircbuf setup for Android.

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch android
in repository gnuradio.

commit ff27361525e3041be63d47c1367b38375c0398ef
Author: Tom Rondeau <address@hidden>
Date:   Tue May 5 15:05:51 2015 -0400

    runtime: android: tweaking vmcircbuf setup for Android.
---
 gnuradio-runtime/lib/vmcircbuf.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnuradio-runtime/lib/vmcircbuf.cc 
b/gnuradio-runtime/lib/vmcircbuf.cc
index 9746344..cfc0f2c 100644
--- a/gnuradio-runtime/lib/vmcircbuf.cc
+++ b/gnuradio-runtime/lib/vmcircbuf.cc
@@ -68,10 +68,16 @@ namespace gr {
 
     std::vector<gr::vmcircbuf_factory *> all = all_factories ();
 
+    // FIXME: Clean up between Android/normal
+    #if ANDROID
+    int ret = 35;
+    char name[35] = "gr::vmcircbuf_mmap_tmpfile_factory";
+    #else
     char name[1024];
-    //gr::vmcircbuf_prefs::get(FACTORY_PREF_KEY, name, sizeof(name));
-    name = "gr::vmcircbuf_mmap_tmpfile_factory";
-    if(name) {
+    int ret = gr::vmcircbuf_prefs::get(FACTORY_PREF_KEY, name, sizeof(name));
+    #endif
+
+    if(ret) {
       for(unsigned int i = 0; i < all.size (); i++) {
         if(strncmp(name, all[i]->name(), strlen(all[i]->name())) == 0) {
           s_default_factory = all[i];