merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:06 +0000 (01:16 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:06 +0000 (01:16 +0900)
commita78af94c390410dbdfc3fd3aa37e2b02123061b3
tree60ac0af65bc61f817b1123cb62b356084923297a
parent7ca00d5b36269273d3ac7ec57422c2f7925bda94
merge with master
57 files changed:
Makefile.am
common/include/media-server-db-svc.h [deleted file]
common/include/media-server-dbus-type.h [deleted file]
common/include/media-server-dbus.h [deleted file]
common/include/media-server-inotify-internal.h [deleted file]
common/include/media-server-inotify.h [deleted file]
common/media-server-db-svc.c [deleted file]
common/media-server-dbus.c [deleted file]
common/media-server-inotify-internal.c [deleted file]
common/media-server-inotify.c [deleted file]
common/scanner/include/media-scanner-utils.h [deleted file]
common/scanner/media-scanner-drm.c [deleted file]
common/scanner/media-scanner-utils.c [deleted file]
configure.ac
lib/include/media-server-ipc.h
lib/include/media-util-err.h
lib/include/media-util-internal.h
lib/include/media-util-ipc.h
lib/include/media-util-noti.h
lib/include/media-util-register.h
lib/media-util-db.c
lib/media-util-ipc.c
lib/media-util-noti.c
lib/media-util-register.c
media-server.manifest
packaging/media-server.service
packaging/media-server.spec
reset_mediadb.sh [deleted file]
src/common/include/media-common-dbg.h [new file with mode: 0755]
src/common/include/media-common-drm.h [moved from common/include/media-server-drm.h with 100% similarity]
src/common/include/media-common-external-storage.h [moved from common/include/media-server-external-storage.h with 92% similarity]
src/common/include/media-common-types.h [moved from common/include/media-server-types.h with 88% similarity]
src/common/include/media-common-utils.h [moved from common/include/media-server-utils.h with 90% similarity]
src/common/media-common-drm.c [moved from common/media-server-drm.c with 72% similarity]
src/common/media-common-external-storage.c [moved from common/media-server-external-storage.c with 72% similarity]
src/common/media-common-utils.c [moved from common/media-server-utils.c with 64% similarity]
src/mediadb-update.c [moved from common/mediadb-update.c with 91% similarity]
src/scanner/include/media-scanner-db-svc.h [moved from common/scanner/include/media-scanner-db-svc.h with 82% similarity]
src/scanner/include/media-scanner-dbg.h [moved from common/scanner/include/media-scanner-dbg.h with 100% similarity]
src/scanner/include/media-scanner-scan.h [moved from common/scanner/include/media-scanner-scan.h with 100% similarity]
src/scanner/include/media-scanner-socket.h [moved from common/scanner/include/media-scanner-socket.h with 97% similarity]
src/scanner/media-scanner-db-svc.c [moved from common/scanner/media-scanner-db-svc.c with 86% similarity]
src/scanner/media-scanner-scan.c [moved from common/scanner/media-scanner-scan.c with 57% similarity]
src/scanner/media-scanner-socket.c [moved from common/scanner/media-scanner-socket.c with 89% similarity]
src/scanner/media-scanner.c [moved from common/scanner/media-scanner.c with 80% similarity]
src/server/include/media-server-db-svc.h [moved from common/scanner/include/media-scanner-drm.h with 62% similarity]
src/server/include/media-server-db.h [moved from common/include/media-server-db.h with 100% similarity]
src/server/include/media-server-dbg.h [moved from common/include/media-server-dbg.h with 100% similarity]
src/server/include/media-server-scanner.h [moved from common/include/media-server-scanner.h with 100% similarity]
src/server/include/media-server-socket.h [moved from common/include/media-server-socket.h with 97% similarity]
src/server/include/media-server-thumb.h [moved from common/include/media-server-thumb.h with 84% similarity]
src/server/media-server-db-svc.c [new file with mode: 0755]
src/server/media-server-db.c [moved from common/media-server-db.c with 98% similarity]
src/server/media-server-main.c [moved from common/media-server-main.c with 75% similarity]
src/server/media-server-scanner.c [moved from common/media-server-scanner.c with 93% similarity]
src/server/media-server-socket.c [moved from common/media-server-socket.c with 81% similarity]
src/server/media-server-thumb.c [moved from common/media-server-thumb.c with 91% similarity]