;Merge ../../yap-6.3
This commit is contained in:
@@ -5,11 +5,17 @@
|
||||
|
||||
#include "streamer.h"
|
||||
|
||||
extern "C" {
|
||||
|
||||
extern void Java_pt_up_yap_streamerJNI_swig_1module_1init(void);
|
||||
|
||||
}
|
||||
|
||||
static AndroidStreamer * streamerInstance = 0;
|
||||
|
||||
void setStreamer(AndroidStreamer* streamer) {
|
||||
streamerInstance = streamer;
|
||||
Java_pt_up_yap_streamerJNI_swig_1module_1init();
|
||||
}
|
||||
|
||||
AndroidStreamer& getStreamer() {
|
||||
@@ -35,7 +41,7 @@ static VFS_t *andstream;
|
||||
static std::string buff0;
|
||||
|
||||
static void *
|
||||
and_open(struct vfs *me, int sno, const char *name, const char *io_mode) {
|
||||
and_open(struct vfs *me, const char *name, const char *io_mode, int sno) {
|
||||
// we assume object is already open, so there is no need to open it.
|
||||
GLOBAL_Stream[sno].vfs_handle = streamerInstance;
|
||||
GLOBAL_Stream[sno].vfs = me;
|
||||
@@ -106,4 +112,4 @@ void Java_pt_up_yap_streamerJNI_swig_1module_1init(void) {
|
||||
} ;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user