modify DB schema

Change-Id: I84ac94836b5896e72ec9fe59a45bcc782120dd56

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 5625a6c..4c486a9 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -507,6 +507,10 @@ typedef struct _media_content_cb_data {
 #define SELECT_TAG_COUNT_BY_MEDIA_ID                   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_uuid = '%q'"
 #define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, name FROM "DB_VIEW_TAG" WHERE media_uuid = '%s'"
 
+/* Get Media list of Group */
+#define MEDIA_INFO_ITEM "media_uuid, path, file_name, media_type, mime_type, size, added_time, modified_time, thumbnail_path, description, \
+                                                       rating, favourite, author, provider, content_name, category, location_tag, age_rating, keyword, is_drm, storage_type, longitude, latitude, altitude, width, height, datetaken, orientation, title, album, artist, album_artist, genre, composer, year, recorded_date, copyright, track_num, bitrate, bitpersample, duration, played_count, last_played_time, last_played_position, samplerate, channel, burst_id, timeline, weather, sync_status"
+
 /* Playlist Info */
 #define INSERT_PLAYLIST_TO_PLAYLIST                                            "INSERT INTO "DB_TABLE_PLAYLIST" (name) VALUES (%Q)"
 #define UPDATE_PLAYLIST_NAME_FROM_PLAYLIST                     "UPDATE "DB_TABLE_PLAYLIST" SET name='%q' WHERE playlist_id=%d"

diff --git a/src/media_info.c b/src/media_info.c
index d55eac8..466672a 100755 (executable)
--- a/src/media_info.c
+++ b/src/media_info.c
@@ -1275,6 +1275,7 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                        _dst->audio_meta->samplerate = _src->audio_meta->samplerate;
                        _dst->audio_meta->duration = _src->audio_meta->duration;
                        _dst->audio_meta->bitrate = _src->audio_meta->bitrate;
+                       _dst->audio_meta->bitpersample = _src->audio_meta->bitpersample;
                        _dst->audio_meta->played_count = _src->audio_meta->played_count;
                        _dst->audio_meta->played_time = _src->audio_meta->played_time;
                        _dst->audio_meta->played_position = _src->audio_meta->played_position;
@@ -1609,6 +1610,7 @@ int media_info_get_audio(media_info_h media, audio_meta_h *audio)
 
        _audio->duration = _media->audio_meta->duration;
        _audio->bitrate = _media->audio_meta->bitrate;
+       _audio->bitpersample = _media->audio_meta->bitpersample;
        _audio->samplerate = _media->audio_meta->samplerate;
        _audio->channel = _media->audio_meta->channel;
        _audio->played_time = _media->audio_meta->played_time;

diff --git a/test/media-content_test.c b/test/media-content_test.c
index f457f1e..0086c0a 100755 (executable)
--- a/test/media-content_test.c
+++ b/test/media-content_test.c
@@ -897,7 +897,7 @@ int test_filter_create(void)
        int ret = MEDIA_CONTENT_ERROR_NONE;
 
        /* Filter for media */
-       char *condition = "MEDIA_TYPE=0";       /*MEDIA_TYPE 0-image, 1-video, 2-sound, 3-music, 4-other*/
+       char *condition = "MEDIA_TYPE=1";       /*MEDIA_TYPE 0-image, 1-video, 2-sound, 3-music, 4-other*/
        //char *condition = "MEDIA_TYPE IS NOT 0 AND MEDIA_DESCRIPTION IS NOT NULL";    /*MEDIA_TYPE 0-image, 1-video, 2-sound, 3-music, 4-other*/
 
        ret = media_filter_create(&g_filter);
@@ -922,13 +922,13 @@ int test_filter_create(void)
        ret = media_filter_set_order(g_filter, MEDIA_CONTENT_ORDER_ASC, MEDIA_ARTIST, MEDIA_CONTENT_COLLATE_DEFAULT);
 
        /* Filter for group */
-       char *g_condition = "TAG_NAME like \"\%my\%\"";
+       //char *g_condition = "TAG_NAME like \"\%my\%\"";
        //char *g_condition = "BOOKMARK_MARKED_TIME > 300";
 
        ret = media_filter_create(&g_filter_g);
 
-       ret = media_filter_set_condition(g_filter_g, g_condition, MEDIA_CONTENT_COLLATE_DEFAULT);
-       ret = media_filter_set_order(g_filter_g, MEDIA_CONTENT_ORDER_DESC, TAG_NAME, MEDIA_CONTENT_COLLATE_DEFAULT);
+       //ret = media_filter_set_condition(g_filter_g, g_condition, MEDIA_CONTENT_COLLATE_DEFAULT);
+       //ret = media_filter_set_order(g_filter_g, MEDIA_CONTENT_ORDER_DESC, TAG_NAME, MEDIA_CONTENT_COLLATE_DEFAULT);
 
        return ret;
 }
@@ -3008,6 +3008,10 @@ int main(int argc, char *argv[])
        if(ret != MEDIA_CONTENT_ERROR_NONE)
                return MEDIA_CONTENT_ERROR_NONE;
 
+       ret = test_media_info_operation();
+       if(ret != MEDIA_CONTENT_ERROR_NONE)
+               return ret;
+
 #if 0
        ret = test_move();
        if(ret != MEDIA_CONTENT_ERROR_NONE)