From fd0fd0a0b88355398d7f57c34e30b47a94c8329f Mon Sep 17 00:00:00 2001
From: Farshid Monhaseri <monhaseri.f@gmail.com>
Date: Mon, 3 Feb 2020 17:38:27 +0330
Subject: mediascanner: Clustered media-list & Code unification

Bug-AGL: SPEC-3100

- Add clustered media-list view as an option when the user requests
it with 'view':'clustered' ARGS on event subscription or
'media_result' verb call. If no ARGS passed, the scanner has its
default media-list view.
- Unify event scans & verb-call scans codes as much as possible.
Now scan operation has single & transparent control flow.
- Add 'ScanFilter_t' data structure and a few other modifications
so managing new features and filters will be easier and clear.
- Fix a few bugs.
- Extract precise error messages from deeper functions and log & reply
fail message to the client.

Signed-off-by: Farshid Monhaseri <monhaseri.f@gmail.com>
Change-Id: Ia3629af75614359260eb7af0c0331d6ef9f3bcbe
---
 binding/media-manager.h | 102 +++++++++++++++++++++++++++++-------------------
 1 file changed, 62 insertions(+), 40 deletions(-)

(limited to 'binding/media-manager.h')

diff --git a/binding/media-manager.h b/binding/media-manager.h
index 65ee831..864e552 100644
--- a/binding/media-manager.h
+++ b/binding/media-manager.h
@@ -105,64 +105,86 @@ void DebugTraceSendMsg(int level, gchar* message);
                 "ORDER BY " \
                 "images.title"
 
+enum {
+    LMS_MIN_ID = 0,
+    LMS_AUDIO_ID = 0,
+    LMS_VIDEO_ID,
+    LMS_IMAGE_ID,
+    LMS_SCAN_COUNT
+};
+
+#define MEDIA_LIST_VIEW_DEFAULT  1u
+#define MEDIA_LIST_VIEW_CLUSTERD 2u
+
+#define LMS_AUDIO_SCAN (1 << LMS_AUDIO_ID)
+#define LMS_VIDEO_SCAN (1 << LMS_VIDEO_ID)
+#define LMS_IMAGE_SCAN (1 << LMS_IMAGE_ID)
+
+#define LMS_ALL_SCAN   ( LMS_AUDIO_SCAN | LMS_VIDEO_SCAN | LMS_IMAGE_SCAN )
+
+#define MEDIA_AUDIO "audio"
+#define MEDIA_VIDEO "video"
+#define MEDIA_IMAGE "image"
+#define MEDIA_ALL   "all"
+
+extern const char *lms_scan_types[LMS_SCAN_COUNT];
+
+#define SCAN_URI_DEFAULT NULL
+
 typedef struct {
-    GList *list;
-    gchar *uri_filter;
-    gint  type_filter;
+    gint listview_type;
+    gint scan_types;
+    gchar *scan_uri;
+}ScanFilter_t;
+
+typedef struct {
+    ScanFilter_t filters;
     GMutex m;
-    Scanner1 *lms_proxy;
     GFileMonitor *mon;
+    Scanner1 *lms_proxy;
 } stMediaPlayerManage;
 
+
+typedef struct {
+    gchar *path;
+    struct {
+        gchar *title;
+        gchar *artist;
+        gchar *album;
+        gchar *genre;
+        gint  duration;
+    } metadata;
+}MediaItem_t;
+
+typedef struct {
+    GList *list;
+    gchar* scan_type_str;
+    gint scan_type_id;
+} MediaList_t;
+
+typedef struct {
+    MediaList_t *lists[LMS_SCAN_COUNT];
+    ScanFilter_t *filters;
+} MediaDevice_t;
+
 typedef struct tagBinding_RegisterCallback
 {
-    void (*binding_device_added)(GList *list);
+    void (*binding_device_added)(ScanFilter_t *filters);
     void (*binding_device_removed)(const char *obj_path);
 } Binding_RegisterCallback_t;
 
 /* ------ PUBLIC PLUGIN FUNCTIONS --------- */
-void free_media_item(void *data);
 void BindingAPIRegister(const Binding_RegisterCallback_t* pstRegisterCallback);
 int MediaPlayerManagerInit(void);
 
 gint ScanTypeAppend(gint);
 gint ScanTypeRemove(gint);
+void setAPIMediaListView(gint view);
 
 void ListLock();
 void ListUnlock();
 
-GList* media_lightmediascanner_scan(GList *list, gchar *uri, int scan_type);
-
-struct Media_Item {
-    gchar *path;
-    gchar *type;
-    struct {
-        gchar *title;
-        gchar *artist;
-        gchar *album;
-        gchar *genre;
-        gint  duration;
-    } metadata;
-};
-
-enum {
-    LMS_AUDIO_ID,
-    LMS_VIDEO_ID,
-    LMS_IMAGE_ID,
-    LMS_SCAN_COUNT
-};
-
-#define LMS_AUDIO_SCAN (1 << LMS_AUDIO_ID)
-#define LMS_VIDEO_SCAN (1 << LMS_VIDEO_ID)
-#define LMS_IMAGE_SCAN (1 << LMS_IMAGE_ID)
-
-#define LMS_ALL_SCAN   ( LMS_AUDIO_SCAN | LMS_VIDEO_SCAN | LMS_IMAGE_SCAN )
+gint media_lists_get(MediaDevice_t* mdev, gchar **error);
+void media_device_free(MediaDevice_t *mdev);
 
-#define MEDIA_AUDIO "audio"
-#define MEDIA_VIDEO "video"
-#define MEDIA_IMAGE "image"
-#define MEDIA_ALL   "all"
-
-extern const char *lms_scan_types[LMS_SCAN_COUNT];
-
-#endif
+#endif
\ No newline at end of file
-- 
cgit 1.2.3-korg