summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile_Ecordova.am38
-rw-r--r--src/lib/ecordova/Ecordova_Eo.h2
-rw-r--r--src/lib/ecordova/ecordova_inappbrowser.eo89
-rw-r--r--src/lib/ecordova/ecordova_main.c4
-rw-r--r--src/modules/ecordova/tizen/ecordova_inappbrowser.c78
-rw-r--r--src/modules/ecordova/tizen/ecordova_inappbrowser_private.h16
-rw-r--r--src/modules/ecordova/tizen/ecordova_media.c (renamed from src/lib/ecordova/ecordova_media.c)2
-rw-r--r--src/modules/ecordova/tizen/ecordova_media_private.h (renamed from src/lib/ecordova/ecordova_media_private.h)0
-rw-r--r--src/modules/ecordova/tizen/ecordova_mediafile.c (renamed from src/lib/ecordova/ecordova_mediafile.c)2
-rw-r--r--src/modules/ecordova/tizen/ecordova_mediafile_private.h (renamed from src/lib/ecordova/ecordova_mediafile_private.h)0
-rw-r--r--src/modules/ecordova/tizen/ecordova_networkinformation.c2
11 files changed, 9 insertions, 224 deletions
diff --git a/src/Makefile_Ecordova.am b/src/Makefile_Ecordova.am
index 5004fa0861..1f82cd4d19 100644
--- a/src/Makefile_Ecordova.am
+++ b/src/Makefile_Ecordova.am
@@ -17,7 +17,6 @@ lib/ecordova/ecordova_deviceorientation.eo \
lib/ecordova/ecordova_dialogs.eo \
lib/ecordova/ecordova_geolocation.eo \
lib/ecordova/ecordova_globalization.eo \
-lib/ecordova/ecordova_inappbrowser.eo \
lib/ecordova/ecordova_media.eo \
lib/ecordova/ecordova_networkinformation.eo \
lib/ecordova/ecordova_splashscreen.eo \
@@ -64,39 +63,6 @@ nodist_installed_ecordovamainheaders_DATA = \
lib_ecordova_libecordova_la_SOURCES = \
lib/ecordova/ecordova_main.c
-#lib/ecordova/ecordova_private.h \
-lib/ecordova/ecordova_systeminfo.c \
-lib/ecordova/ecordova_batterystatus.c \
-lib/ecordova/ecordova_console.c \
-lib/ecordova/ecordova_contacts.c \
-lib/ecordova/ecordova_contact.c \
-lib/ecordova/ecordova_contactaddress.c \
-lib/ecordova/ecordova_contactfield.c \
-lib/ecordova/ecordova_contactname.c \
-lib/ecordova/ecordova_contactorganization.c \
-lib/ecordova/ecordova_contacts_record_utils.c \
-lib/ecordova/ecordova_device.c \
-lib/ecordova/ecordova_devicemotion.c \
-lib/ecordova/ecordova_deviceorientation.c \
-lib/ecordova/ecordova_dialogs.c \
-lib/ecordova/ecordova_geolocation.c \
-lib/ecordova/ecordova_globalization.c \
-lib/ecordova/ecordova_inappbrowser.c \
-lib/ecordova/ecordova_media.c \
-lib/ecordova/ecordova_networkinformation.c \
-lib/ecordova/ecordova_splashscreen.c \
-lib/ecordova/ecordova_vibration.c \
-lib/ecordova/ecordova_file.c \
-lib/ecordova/ecordova_filewriter.c \
-lib/ecordova/ecordova_filereader.c \
-lib/ecordova/ecordova_filesystem.c \
-lib/ecordova/ecordova_entry.c \
-lib/ecordova/ecordova_directoryentry.c \
-lib/ecordova/ecordova_directoryreader.c \
-lib/ecordova/ecordova_fileentry.c \
-lib/ecordova/ecordova_mediafile.c \
-lib/ecordova/ecordova_filetransfer.c \
-lib/ecordova/ecordova_capture.c
lib_ecordova_libecordova_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORDOVA_CFLAGS@ @EFL_CFLAGS@ \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -156,7 +122,9 @@ modules/ecordova/tizen/ecordova_fileentry.c \
modules/ecordova/tizen/ecordova_file.c \
modules/ecordova/tizen/ecordova_filereader.c \
modules/ecordova/tizen/ecordova_filetransfer.c \
-modules/ecordova/tizen/ecordova_filewriter.c
+modules/ecordova/tizen/ecordova_filewriter.c \
+modules/ecordova/tizen/ecordova_media.c \
+modules/ecordova/tizen/ecordova_mediafile.c
modules_ecordova_tizen_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
@ECORDOVA_CFLAGS@ -DEFL_ECORDOVA_BUILD
diff --git a/src/lib/ecordova/Ecordova_Eo.h b/src/lib/ecordova/Ecordova_Eo.h
index d1da074fd3..3cbd474f72 100644
--- a/src/lib/ecordova/Ecordova_Eo.h
+++ b/src/lib/ecordova/Ecordova_Eo.h
@@ -16,7 +16,6 @@ typedef Eo Ecordova_DirectoryReader;
#include <ecordova_dialogs.eo.h>
#include <ecordova_geolocation.eo.h>
#include <ecordova_globalization.eo.h>
-#include <ecordova_inappbrowser.eo.h>
#include <ecordova_media.eo.h>
#include <ecordova_networkinformation.eo.h>
#include <ecordova_splashscreen.eo.h>
@@ -31,4 +30,3 @@ typedef Eo Ecordova_DirectoryReader;
#include <ecordova_fileentry.eo.h>
#include <ecordova_mediafile.eo.h>
#include <ecordova_filetransfer.eo.h>
-#include <ecordova_capture.eo.h>
diff --git a/src/lib/ecordova/ecordova_inappbrowser.eo b/src/lib/ecordova/ecordova_inappbrowser.eo
deleted file mode 100644
index d2e16da78f..0000000000
--- a/src/lib/ecordova/ecordova_inappbrowser.eo
+++ /dev/null
@@ -1,89 +0,0 @@
-struct Ecordova_InAppBrowser_InjectDetails {
- file: const(char)*; [[URL of the script/stylesheet to inject.]]
- code: const(char)*; [[Text of the script/stylesheet to inject.]]
-}
-
-struct Ecordova_InAppBrowser_EventProperties {
- type: const(char)*; [[the eventname, either loadstart, loadstop, loaderror, or exit.]]
- url: const(char)*; [[the URL that was loaded.]]
- code: const(char)*; [[the error code, only in the case of loaderror.]]
- message: const(char)*; [[the error message, only in the case of loaderror.]]
-}
-
-class Ecordova.InAppBrowser (Eo.Base) {
- [[Ecordova InAppBrowser Plugin
- Plugin ID: org.apache.cordova.inappbrowser
- http://plugins.cordova.io/#/package/org.apache.cordova.inappbrowser
- ]]
- legacy_prefix: null;
- methods {
- constructor {
- [[Custom Ecordova_InAppBrowser constructor.
- @.constructor
-
- @since 2.3
- ]]
- }
- open @class {
- params {
- url: const(char)*;
- [[The URL to load. Call encodeURI() on this if the URL
- contains Unicode characters.]]
-
- target: const(char)*;
- [[The target in which to load the URL, an optional parameter
- that defaults to _self.]]
-
- options: const(hash<char*,char*>)*;
- [[Options for the InAppBrowser. Optional, defaulting
- to: location=yes.]]
-
- }
- return: Ecordova.InAppBrowser*;
- }
- close {
- [[Closes the InAppBrowser window.]]
- }
- show {
- [[Displays an InAppBrowser window that was opened hidden. Calling
- this has no effect if the InAppBrowser was already visible.]]
- }
- script_execute {
- [[Injects JavaScript code into the InAppBrowser window]]
- params {
- injectDetails: const(Ecordova_InAppBrowser_InjectDetails)*;
- [[details of the script to run, specifying either a file or
- code key.]]
- }
- }
- css_insert {
- [[Injects CSS into the InAppBrowser window.]]
- params {
- injectDetails: const(Ecordova_InAppBrowser_InjectDetails)*;
- [[details of the script to run, specifying either a file or
- code key.]]
- }
- }
- }
- implements {
- Eo.Base.constructor;
- Eo.Base.destructor;
- }
- constructors {
- .constructor;
- }
- events {
- load,start: const(Ecordova_InAppBrowser_EventProperties)*;
- load,stop: const(Ecordova_InAppBrowser_EventProperties)*;
- load,error: const(Ecordova_InAppBrowser_EventProperties)*;
- exit: const(Ecordova_InAppBrowser_EventProperties)*;
-
- script,executed;
- [[If the injected script is of type code, the callback executes with a
- single parameter, which is the return value of the script, wrapped
- in an Array. For multi-line scripts, this is the return value of the
- last statement, or the last expression evaluated.]]
-
- css,injected; [[executes after the CSS is injected.]]
- }
-}
diff --git a/src/lib/ecordova/ecordova_main.c b/src/lib/ecordova/ecordova_main.c
index cab4dea656..29200f9605 100644
--- a/src/lib/ecordova/ecordova_main.c
+++ b/src/lib/ecordova/ecordova_main.c
@@ -268,7 +268,6 @@ ECORDOVA_CLASS_GET(filereader)
ECORDOVA_CLASS_GET(filetransfer)
ECORDOVA_CLASS_GET(geolocation)
ECORDOVA_CLASS_GET(globalization)
-ECORDOVA_CLASS_GET(inappbrowser)
ECORDOVA_CLASS_GET(media)
ECORDOVA_CLASS_GET(mediafile)
ECORDOVA_CLASS_GET(networkinformation)
@@ -296,7 +295,6 @@ ECORDOVA_define_data(FileReader)
ECORDOVA_define_data(FileTransfer)
ECORDOVA_define_data(Geolocation)
ECORDOVA_define_data(Globalization)
-ECORDOVA_define_data(InAppBrowser)
ECORDOVA_define_data(Media)
ECORDOVA_define_data(MediaFile)
ECORDOVA_define_data(NetworkInformation)
@@ -349,8 +347,6 @@ ECORDOVA_define_data(Vibration)
#include "ecordova_geolocation.eo.c"
#include "ecordova_globalization.eo.h"
#include "ecordova_globalization.eo.c"
-#include "ecordova_inappbrowser.eo.h"
-#include "ecordova_inappbrowser.eo.c"
#include "ecordova_media.eo.h"
#include "ecordova_media.eo.c"
#include "ecordova_mediafile.eo.h"
diff --git a/src/modules/ecordova/tizen/ecordova_inappbrowser.c b/src/modules/ecordova/tizen/ecordova_inappbrowser.c
deleted file mode 100644
index 4d6cc1686e..0000000000
--- a/src/modules/ecordova/tizen/ecordova_inappbrowser.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "ecordova_inappbrowser_private.h"
-
-#define MY_CLASS ECORDOVA_INAPPBROWSER_CLASS
-#define MY_CLASS_NAME "Ecordova_InAppBrowser"
-
-static Eo_Base *
-_ecordova_inappbrowser_eo_base_constructor(Eo *obj,
- Ecordova_InAppBrowser_Data *pd)
-{
- DBG("(%p)", obj);
-
- pd->obj = obj;
-
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-}
-
-static void
-_ecordova_inappbrowser_constructor(Eo *obj EINA_UNUSED,
- Ecordova_InAppBrowser_Data *pd EINA_UNUSED)
-{
- DBG("(%p)", obj);
-}
-
-static void
-_ecordova_inappbrowser_eo_base_destructor(Eo *obj,
- Ecordova_InAppBrowser_Data *pd EINA_UNUSED)
-{
- DBG("(%p)", obj);
-
- eo_do_super(obj, MY_CLASS, eo_destructor());
-}
-
-static Ecordova_InAppBrowser*
-_ecordova_inappbrowser_open(Eo *obj EINA_UNUSED,
- void *pd EINA_UNUSED,
- const char *url EINA_UNUSED,
- const char *target EINA_UNUSED,
- const Eina_Hash *options EINA_UNUSED)
-{
- ERR("Not implemented.");
- return NULL;
-}
-
-static void
-_ecordova_inappbrowser_close(Eo *obj EINA_UNUSED,
- Ecordova_InAppBrowser_Data *pd EINA_UNUSED)
-{
- ERR("Not implemented.");
-}
-
-static void
-_ecordova_inappbrowser_show(Eo *obj EINA_UNUSED,
- Ecordova_InAppBrowser_Data *pd EINA_UNUSED)
-{
- ERR("Not implemented.");
-}
-
-static void
-_ecordova_inappbrowser_script_execute(Eo *obj EINA_UNUSED,
- Ecordova_InAppBrowser_Data *pd EINA_UNUSED,
- const Ecordova_InAppBrowser_InjectDetails *injectDetails EINA_UNUSED)
-{
- ERR("Not implemented.");
-}
-
-static void
-_ecordova_inappbrowser_css_insert(Eo *obj EINA_UNUSED,
- Ecordova_InAppBrowser_Data *pd EINA_UNUSED,
- const Ecordova_InAppBrowser_InjectDetails *injectDetails EINA_UNUSED)
-{
- ERR("Not implemented.");
-}
-
-#include "ecordova_inappbrowser.eo.c"
diff --git a/src/modules/ecordova/tizen/ecordova_inappbrowser_private.h b/src/modules/ecordova/tizen/ecordova_inappbrowser_private.h
deleted file mode 100644
index 4526e8773b..0000000000
--- a/src/modules/ecordova/tizen/ecordova_inappbrowser_private.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _ECORDOVA_INAPPBROWSER_PRIVATE_H
-#define _ECORDOVA_INAPPBROWSER_PRIVATE_H
-
-#include "ecordova_private.h"
-
-typedef struct _Ecordova_InAppBrowser_Data Ecordova_InAppBrowser_Data;
-
-/**
- * Ecordova.InAppBrowser private data
- */
-struct _Ecordova_InAppBrowser_Data
-{
- Eo *obj;
-};
-
-#endif
diff --git a/src/lib/ecordova/ecordova_media.c b/src/modules/ecordova/tizen/ecordova_media.c
index 926a2cad49..4fef7d10ae 100644
--- a/src/lib/ecordova/ecordova_media.c
+++ b/src/modules/ecordova/tizen/ecordova_media.c
@@ -2,6 +2,7 @@
# include <config.h>
#endif
+#if defined(TIZEN_MEDIA_METADATA_EXTRACTOR) && defined(TIZEN_MEDIA_PLAYER) && defined(TIZEN_MEDIA_RECORDER)
#include "ecordova_media_private.h"
#define MY_CLASS ECORDOVA_MEDIA_CLASS
@@ -529,3 +530,4 @@ _start_record(Ecordova_Media_Data *pd)
}
#include "ecordova_media.eo.c"
+#endif
diff --git a/src/lib/ecordova/ecordova_media_private.h b/src/modules/ecordova/tizen/ecordova_media_private.h
index 84d7dbe9ec..84d7dbe9ec 100644
--- a/src/lib/ecordova/ecordova_media_private.h
+++ b/src/modules/ecordova/tizen/ecordova_media_private.h
diff --git a/src/lib/ecordova/ecordova_mediafile.c b/src/modules/ecordova/tizen/ecordova_mediafile.c
index b227835cde..dd3084541b 100644
--- a/src/lib/ecordova/ecordova_mediafile.c
+++ b/src/modules/ecordova/tizen/ecordova_mediafile.c
@@ -2,6 +2,7 @@
# include <config.h>
#endif
+#if defined(TIZEN_MEDIA_METADATA_EXTRACTOR) && defined(TIZEN_MEDIA_PLAYER) && defined(TIZEN_MEDIA_RECORDER)
#include "ecordova_mediafile_private.h"
#include <stdbool.h>
#include <limits.h>
@@ -185,3 +186,4 @@ _int_metadata_get(metadata_extractor_h extractor,
}
#include "ecordova_mediafile.eo.c"
+#endif
diff --git a/src/lib/ecordova/ecordova_mediafile_private.h b/src/modules/ecordova/tizen/ecordova_mediafile_private.h
index 1e7e8621d2..1e7e8621d2 100644
--- a/src/lib/ecordova/ecordova_mediafile_private.h
+++ b/src/modules/ecordova/tizen/ecordova_mediafile_private.h
diff --git a/src/modules/ecordova/tizen/ecordova_networkinformation.c b/src/modules/ecordova/tizen/ecordova_networkinformation.c
index e89dc7018a..c8740d2a10 100644
--- a/src/modules/ecordova/tizen/ecordova_networkinformation.c
+++ b/src/modules/ecordova/tizen/ecordova_networkinformation.c
@@ -2,6 +2,7 @@
# include <config.h>
#endif
+#ifdef HAVE_TIZEN_NETWORK_CONNECTION
#include "ecordova_networkinformation_private.h"
#define MY_CLASS ECORDOVA_NETWORKINFORMATION_CLASS
@@ -96,3 +97,4 @@ _type_changed_cb(connection_type_e type, void *user_data)
}
#include "ecordova_networkinformation.eo.c"
+#endif
View Lorry Controller Status