[camera/tm1] Enable waylandsink, [camera/all] change sample name and files

Change-Id: Ibfb307a8b4e061235b3d27e6d05ca1a7ead1c463
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/mmfw-sysconf-simulator/etc/pulse/system.pa b/mmfw-sysconf-simulator/etc/pulse/system.pa
index d81a5aceee549bc3a703ccff5fe31a1f95d23300..5ef305a31455a92e2f3f682300d4ab759cf363ae 100644 (file)
--- a/mmfw-sysconf-simulator/etc/pulse/system.pa
+++ b/mmfw-sysconf-simulator/etc/pulse/system.pa
@@ -60,5 +60,7 @@ load-module module-always-sink
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle timeout=1
 
-load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
+load-sample camera-shutter-01 /usr/share/sounds/mm-camcorder/capture_shutter_01.wav
+load-sample camera-shutter-02 /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
+load-sample recording-start /usr/share/sounds/mm-camcorder/recording_start_01.wav
 load-sample recording-stop /usr/share/sounds/mm-camcorder/recording_stop_01.wav

diff --git a/mmfw-sysconf-target-hawkp/etc/pulse/system.pa b/mmfw-sysconf-target-hawkp/etc/pulse/system.pa
index b8cc5afec8d242fa2fd9974e2b5bd2effb874e88..7cea3fa1509a6c0bfa24c71d4f1923d39b253fbc 100644 (file)
--- a/mmfw-sysconf-target-hawkp/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-hawkp/etc/pulse/system.pa
@@ -57,5 +57,7 @@ load-module module-always-sink
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle timeout=1
 
-load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
+load-sample camera-shutter-01 /usr/share/sounds/mm-camcorder/capture_shutter_01.wav
+load-sample camera-shutter-02 /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
+load-sample recording-start /usr/share/sounds/mm-camcorder/recording_start_01.wav
 load-sample recording-stop /usr/share/sounds/mm-camcorder/recording_stop_01.wav

diff --git a/mmfw-sysconf-target-n4/etc/pulse/system.pa b/mmfw-sysconf-target-n4/etc/pulse/system.pa
index d81a5aceee549bc3a703ccff5fe31a1f95d23300..5ef305a31455a92e2f3f682300d4ab759cf363ae 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-n4/etc/pulse/system.pa
@@ -60,5 +60,7 @@ load-module module-always-sink
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle timeout=1
 
-load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
+load-sample camera-shutter-01 /usr/share/sounds/mm-camcorder/capture_shutter_01.wav
+load-sample camera-shutter-02 /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
+load-sample recording-start /usr/share/sounds/mm-camcorder/recording_start_01.wav
 load-sample recording-stop /usr/share/sounds/mm-camcorder/recording_stop_01.wav

diff --git a/mmfw-sysconf-target-tm1/etc/pulse/system.pa b/mmfw-sysconf-target-tm1/etc/pulse/system.pa
index d81a5aceee549bc3a703ccff5fe31a1f95d23300..5ef305a31455a92e2f3f682300d4ab759cf363ae 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-tm1/etc/pulse/system.pa
@@ -60,5 +60,7 @@ load-module module-always-sink
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle timeout=1
 
-load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
+load-sample camera-shutter-01 /usr/share/sounds/mm-camcorder/capture_shutter_01.wav
+load-sample camera-shutter-02 /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
+load-sample recording-start /usr/share/sounds/mm-camcorder/recording_start_01.wav
 load-sample recording-stop /usr/share/sounds/mm-camcorder/recording_stop_01.wav

diff --git a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland
index eb587a493ae9991e4dd5c9264b6ea9a5eddb2959..6cc2e2bef7361156403f8c44a81e03292d412483 100644 (file)
--- a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland
+++ b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland
@@ -51,8 +51,7 @@ DisplayMode = 0,1,2 || 0
 ; Videosink
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 5: Remote
 Videosink = 0,1,3,5 || 1
-VideosinkElementX = fakesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0
-;VideosinkElementX = waylandsink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0
+VideosinkElementX = waylandsink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0
 VideosinkElementEvas = evasimagesink | 4,0 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0
 VideosinkElementRemote = tizenipcsink | 4,0 | permissions,511 | enable-last-sample,0 | qos,0 | sync,0
 VideosinkElementNull = fakesink | 4,0 | qos,0 | sync,0 | enable-last-sample,0 | show-preroll-frame,0

diff --git a/mmfw-sysconf-target-u3/etc/pulse/system.pa b/mmfw-sysconf-target-u3/etc/pulse/system.pa
index d81a5aceee549bc3a703ccff5fe31a1f95d23300..5ef305a31455a92e2f3f682300d4ab759cf363ae 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-u3/etc/pulse/system.pa
@@ -60,5 +60,7 @@ load-module module-always-sink
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle timeout=1
 
-load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
+load-sample camera-shutter-01 /usr/share/sounds/mm-camcorder/capture_shutter_01.wav
+load-sample camera-shutter-02 /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
+load-sample recording-start /usr/share/sounds/mm-camcorder/recording_start_01.wav
 load-sample recording-stop /usr/share/sounds/mm-camcorder/recording_stop_01.wav

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index f3352f0f4b1efd158b47138d4be40d144c10d7eb..e47a6d31a93f8c6b560833022249f697a5414c37 100644 (file)
--- a/packaging/mmfw-sysconf.spec
+++ b/packaging/mmfw-sysconf.spec
@@ -2,7 +2,7 @@
 
 Name:       mmfw-sysconf
 Summary:    Multimedia Framework system configuration package
-Version:    0.2.44
+Version:    0.2.45
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1+ and Apache-2.0