tizen 2.3 releasetizen_2.3_releasesubmit/tizen_2.3/20150202.063302tizen_2.3

84 files changed, 609 insertions, 3123 deletions

diff --git a/mmfw-sysconf-cleansdk-e4x12/etc/pulse/client.conf b/mmfw-sysconf-cleansdk-e4x12/etc/pulse/client.conf
index 8e0de79..b78d121 100644..100755
--- a/mmfw-sysconf-cleansdk-e4x12/etc/pulse/client.conf
+++ b/mmfw-sysconf-cleansdk-e4x12/etc/pulse/client.conf
@@ -16,12 +16,13 @@
 # USA.
 
 ## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
-## more information. Default values a commented out.  Use either ; or # for
+## more information. Default values are commented out.  Use either ; or # for
 ## commenting.
 
 ; default-sink =
 ; default-source =
 ; default-server =
+; default-dbus-server =
 
 ; autospawn = yes
 ; daemon-binary = /usr/bin/pulseaudio
@@ -30,4 +31,7 @@
 ; cookie-file =
 
 ; enable-shm = yes
-shm-size-bytes = 2097152 # setting this 0 will use the system-default, usually 64 MiB
+shm-size-bytes = 4194304 # setting this 0 will use the system-default, usually 64 MiB
+
+; auto-connect-localhost = no
+; auto-connect-display = no
diff --git a/mmfw-sysconf-cleansdk-e4x12/etc/pulse/daemon.conf b/mmfw-sysconf-cleansdk-e4x12/etc/pulse/daemon.conf
index 9e9991f..8d728d0 100644..100755
--- a/mmfw-sysconf-cleansdk-e4x12/etc/pulse/daemon.conf
+++ b/mmfw-sysconf-cleansdk-e4x12/etc/pulse/daemon.conf
@@ -16,15 +16,16 @@
 # USA.
 
 ## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
-## more information. Default values a commented out.  Use either ; or # for
+## more information. Default values are commented out.  Use either ; or # for
 ## commenting.
 
-; daemonize = no
+daemonize = yes
 ; fail = yes
 ; allow-module-loading = yes
 ; allow-exit = yes
 ; use-pid-file = yes
-; system-instance = no
+system-instance = yes
+; local-server-type = user
 ; enable-shm = yes
 ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
 ; lock-memory = no
@@ -42,7 +43,7 @@ realtime-priority = 5
 ; dl-search-path = (depends on architecture)
 
 ; load-default-script-file = yes
-; default-script-file =
+; default-script-file = /etc/pulse/default.pa
 
 log-target = dlog-color
 ; log-level = notice
@@ -50,7 +51,7 @@ log-target = dlog-color
 ; log-time = no
 ; log-backtrace = 0
 
-resample-method = ffmpeg
+resample-method = speex-fixed-3
 ; enable-remixing = yes
 ; enable-lfe-remixing = no
 
@@ -74,6 +75,7 @@ flat-volumes = no
 
 ; default-sample-format = s16le
 ; default-sample-rate = 44100
+alternate-sample-rate = 44100
 ; default-sample-channels = 2
 ; default-channel-map = front-left,front-right
 
diff --git a/mmfw-sysconf-cleansdk-e4x12/etc/pulse/system.pa b/mmfw-sysconf-cleansdk-e4x12/etc/pulse/system.pa
index 8e4d955..bff3115 100644..100755
--- a/mmfw-sysconf-cleansdk-e4x12/etc/pulse/system.pa
+++ b/mmfw-sysconf-cleansdk-e4x12/etc/pulse/system.pa
@@ -19,16 +19,26 @@
 # This startup script is used only if PulseAudio is started in system
 # mode.
 
-### Automatically load driver modules depending on the hardware available
-.ifexists module-hal-detect.so
-#load-module module-hal-detect
-.else
-### Alternatively use the static hardware detection module (for systems that
-### lack HAL support)
-#load-module module-detect
+### Custom policy module to route between bt<=speaker
+load-module module-policy
+
+### Stream Manager module
+load-module module-stream-mgr ipc_type=pipe
+load-module module-role-ducking global=1 volume=0
+
+### Currently do not use module-udev-detect, because there is some problem.
+### 	STATIC DEVICE LOAD
 load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,3
 load-module module-alsa-source source_name=alsa_input.0.analog-stereo device=hw:0,0
-.endif
+###	AUTOMATIC DEVICE LOAD
+### Automatically load driver modules depending on the hardware available
+#.ifexists module-udev-detect.so
+#load-module module-udev-detect
+#.else
+### Use the static hardware detection module (for systems that lack udev/hal support)
+#load-module module-detect
+#.endif
+
 
 ### Load several protocols
 .ifexists module-esound-protocol-unix.so
@@ -38,8 +48,7 @@ load-module module-native-protocol-unix
 
 load-module module-bluetooth-discover
 
-### Custom policy module to route between bt<=speaker
-load-module module-policy
+
 
 ### Automatically restore the volume of streams and devices
 #load-module module-stream-restore
@@ -48,6 +57,11 @@ load-module module-policy
 ### Automatically restore the default sink/source when changed by the user during runtime
 load-module module-default-device-restore
 
+.ifexists module-dbus-protocol.so
+### If you want to allow TCP connections, set access to "remote" or "local,remote".
+load-module module-dbus-protocol access=local
+.endif
+
 ### Automatically move streams to the default sink if the sink they are
 ### connected to dies, similar for sources
 load-module module-rescue-streams
@@ -64,5 +78,8 @@ load-module module-suspend-on-idle
 ### Set default source (not to use alsa_sink monitor which is index 0)
 set-default-source alsa_input.0.analog-stereo
 
+load-module module-null-sink
+load-module module-null-source
+
 load-module module-remap-sink sink_name=mono_alsa master=alsa_output.0.analog-stereo channels=1
 load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
diff --git a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_audio_pcm_dump.ini b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_audio_pcm_dump.ini
new file mode 100644
index 0000000..54e2d2e
--- /dev/null
+++ b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_audio_pcm_dump.ini
@@ -0,0 +1,12 @@
+
+[pcm_dump]
+
+# playback
+
+pa_sink                        = n
+pa_sink_input                  = n
+
+# capture
+
+pa_source                      = n
+pa_source_output               = n
diff --git a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_audio_volume.ini b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_audio_volume.ini
new file mode 100755
index 0000000..867ca00
--- /dev/null
+++ b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_audio_volume.ini
@@ -0,0 +1,61 @@
+
+[speaker]
+system                         = 0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 82, 84, 86, 88, 90
+notification                   = 0, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 95
+alarm                          = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+ringtone                       = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+media                          = 0, 60, 63, 66, 69, 72, 75, 77, 79, 81, 83, 86, 88, 91, 94, 97
+call                           = 60, 65, 70, 76, 82, 88, 94, 100
+voip                           = 60, 65, 70, 76, 82, 88, 94, 100
+voice                          = 0, 60, 63, 66, 69, 72, 75, 77, 79, 81, 83, 86, 88, 91, 94, 97
+gain_dialer                    = 1.00
+gain_touch                     = 1.00
+gain_af                        = 0.70
+gain_shutter1                  = 0.14
+gain_shutter2                  = 1.00
+gain_camcording                = 0.30
+gain_midi                      = 1.00
+gain_booting                   = 0.40
+gain_video                     = 0.90
+gain_tts                       = 1.00
+
+[headset]
+system                         = 0, 54, 56, 58, 60, 62, 64, 67, 70, 73, 76, 79, 82, 85, 88, 91
+notification                   = 0, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 95
+alarm                          = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+ringtone                       = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+media                          = 0, 44, 48, 52, 56, 61, 66, 70, 74, 78, 82, 85, 88, 91, 94, 97
+call                           = 60, 65, 70, 76, 82, 88, 94, 100
+voip                           = 60, 65, 70, 76, 82, 88, 94, 100
+voice                          = 0, 55, 58, 61, 64, 67, 70, 73, 76, 79, 82, 85, 88, 91, 94, 97
+gain_dialer                    = 0.50
+gain_touch                     = 0.60
+gain_af                        = 1.00
+gain_shutter1                  = 1.00
+gain_shutter2                  = 0.80
+gain_camcording                = 0.80
+gain_midi                      = 0.40
+gain_booting                   = 0.60
+gain_video                     = 1.00
+gain_tts                       = 1.00
+
+[btheadset]
+system                         = 0, 55, 58, 61, 63, 66, 69, 72, 75, 78, 81, 84, 87, 90, 93, 96
+notification                   = 0, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 95
+alarm                          = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+ringtone                       = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+media                          = 0, 50, 54, 58, 62, 66, 70, 74, 78, 81, 84, 88, 91, 95, 97, 100
+call                           = 60, 64, 70, 76, 82, 88, 94, 100
+voip                           = 60, 64, 70, 76, 82, 88, 94, 100
+voice                          = 0, 55, 58, 61, 64, 67, 70, 73, 76, 79, 82, 85, 88, 91, 94, 100
+gain_dialer                    = 0.70
+gain_touch                     = 0.70
+gain_af                        = 1.00
+gain_shutter1                  = 1.00
+gain_shutter2                  = 1.00
+gain_camcording                = 1.00
+gain_midi                      = 1.00
+gain_booting                   = 0.70
+gain_video                     = 1.00
+gain_tts                       = 1.00
+
diff --git a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder.ini
index b1ba27f..c3cdb8f 100644..100755
--- a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder.ini
@@ -32,9 +32,10 @@ UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 1
 DeviceCount = 1
+SupportMediaPacketPreviewCb = 0
 
 [AudioInput]
-AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | slave-method,3
 AudiomodemsrcElement = voicedatasrcbin | 0,0
 
 [VideoOutput]
@@ -79,7 +80,7 @@ UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 1
 VideoAutoAudioResample = 0
-VideoAutoColorSpace = 0
+VideoAutoColorSpace = 1
 AudioProfile = 1
 AudioAutoAudioConvert = 1
 AudioAutoAudioResample = 0
diff --git a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder_dev_video_pri.ini
index 3474f4e..66e060f 100644
--- a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -23,6 +23,7 @@ InputIndex = 0,-255 || 0
 DeviceName = S5C73M3
 PreviewResolution = 176,144 | 320,240 | 640,480 | 960,720 | 1280,720 | 1920,1080 || 640,480
 CaptureResolution = 640,480 | 1280,720 | 2048,1152 | 2048,1536 | 3264,1836 | 3264,2176 | 3264,2448 || 3264,2448
+VideoResolution = 176,144 | 320,240 | 640,480 | 960,720 | 1280,720 | 1920,1080 || 640,480
 FPS = 0,8,15,24,25,30,60,120 || 30
 ; PictureForamt - MSL value
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
@@ -80,8 +81,8 @@ ColorTone = 1,2,3,6,-255,-255,4,-255,-255,-255,-255,-255,-255,-255,-255,-255,-25
 ; Flip - real setting value
 ;;; 0:NONE, 1:VERTICAL, 2:HORIZONTAL
 ; Flip - MSL value(convert array index)
-;;; 0:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 0
 
 ; Wide Dynamic Range - real setting value
 ;;; 0:OFF, 1:ON
diff --git a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_player.ini b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_player.ini
index 3cf2a31..274b627 100644
--- a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_player.ini
+++ b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_player.ini
@@ -14,7 +14,7 @@ videosink element fake = fakesink
 
 video converter element = ffmpegcolorspace
 
-audiosink element = avsysaudiosink 
+audiosink element = pulsesink
 
 drmsrc element = filesrc 
 
diff --git a/mmfw-sysconf-cleansdk-e4x12/usr/share/pulseaudio/alsa-mixer/profile-sets/tizen_usb.conf b/mmfw-sysconf-cleansdk-e4x12/usr/share/pulseaudio/alsa-mixer/profile-sets/tizen_usb.conf
new file mode 100644
index 0000000..31bc6a6
--- /dev/null
+++ b/mmfw-sysconf-cleansdk-e4x12/usr/share/pulseaudio/alsa-mixer/profile-sets/tizen_usb.conf
@@ -0,0 +1,120 @@
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+; Default profile definitions for the ALSA backend of PulseAudio. This
+; is used as fallback for all cards that have no special mapping
+; assigned (and should be good enough for the vast majority of
+; cards). If you want to assign a different profile set than this one
+; to a device, either set the udev property PULSE_PROFILE_SET for the
+; card, or use the "profile_set" module argument when loading
+; module-alsa-card.
+;
+; So what is this about? Simply, what we do here is map ALSA devices
+; to how they are exposed in PA. We say which ALSA device string to
+; use to open a device, which channel mapping to use then, and which
+; mixer path to use. This is encoded in a 'mapping'. Multiple of these
+; mappings can be bound together in a 'profile' which is then directly
+; exposed in the UI as a card profile. Each mapping assigned to a
+; profile will result in one sink/source to be created if the profile
+; is selected for the card.
+;
+; Additionally, the path set configuration files can describe the
+; decibel values assigned to the steps of the volume elements. This
+; can be used to work around situations when the alsa driver doesn't
+; provide any decibel information, or when the information is
+; incorrect.
+
+
+; [General]
+; auto-profiles = no | yes                  # Instead of defining all profiles manually, autogenerate
+;                                           # them by combining every input mapping with every output mapping.
+;
+; [Mapping id]
+; device-strings = ...                      # ALSA device string. %f will be replaced by the card identifier.
+; channel-map = ...                         # Channel mapping to use for this device
+; description = ...
+; paths-input = ...                         # A list of mixer paths to use. Every path in this list will be probed.
+;                                           # If multiple are found to be working they will be available as device ports
+; paths-output = ...
+; element-input = ...                       # Instead of configuring a full mixer path simply configure a single
+;                                           # mixer element for volume/mute handling
+; element-output = ...
+; priority = ...
+; direction = any | input | output          # Only useful for?
+;
+; [Profile id]
+; input-mappings = ...                      # Lists mappings for sources on this profile, those mapping must be
+;                                           # defined in this file too
+; output-mappings = ...                     # Lists mappings for sinks on this profile, those mappings must be
+;                                           # defined in this file too
+; description = ...
+; priority = ...                            # Numeric value to deduce priority for this profile
+; skip-probe = no | yes                     # Skip probing for availability? If this is yes then this profile
+;                                           # will be assumed as working without probing. Makes initialization
+;                                           # a bit faster but only works if the card is really known well.
+;
+; [DecibelFix element]                      # Decibel fixes can be used to work around missing or incorrect dB
+;                                           # information from alsa. A decibel fix is a table that maps volume steps
+;                                           # to decibel values for one volume element. The "element" part in the
+;                                           # section title is the name of the volume element.
+;                                           #
+;                                           # NOTE: This feature is meant just as a help for figuring out the correct
+;                                           # decibel values. PulseAudio is not the correct place to maintain the
+;                                           # decibel mappings!
+;                                           #
+;                                           # If you need this feature, then you should make sure that when you have
+;                                           # the correct values figured out, the alsa driver developers get informed
+;                                           # too, so that they can fix the driver.
+;
+; db-values = ...                           # The option value consists of pairs of step numbers and decibel values.
+;                                           # The pairs are separated with whitespace, and steps are separated from
+;                                           # the corresponding decibel values with a colon. The values must be in an
+;                                           # increasing order. Here's an example of a valid string:
+;                                           #
+;                                           #     "0:-40.50  1:-38.70  3:-33.00  11:0"
+;                                           #
+;                                           # The lowest step imposes a lower limit for hardware volume and the
+;                                           # highest step correspondingly imposes a higher limit. That means that
+;                                           # that the mixer will never be set outside those values - the rest of the
+;                                           # volume scale is done using software volume.
+;                                           #
+;                                           # As can be seen in the example, you don't need to specify a dB value for
+;                                           # each step. The dB values for skipped steps will be linearly interpolated
+;                                           # using the nearest steps that are given.
+
+[General]
+auto-profiles = yes
+
+[Mapping usb-analog-stereo]
+device-strings = hw:%f
+channel-map = left,right
+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
+priority = 10
+direction = output
+
+[Mapping usb-analog-surround-51]
+device-strings = hw:%f
+;channel-map = front-left,front-right,front-center,lfe,rear-left,rear-right
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
+priority = 180
+direction = output
+
+; An example for defining multiple-sink profiles
+#[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo]
+#description = Foobar
+#output-mappings = analog-stereo iec958-stereo
+#input-mappings = analog-stereo
diff --git a/mmfw-sysconf-e3250/etc/pulse/system.pa b/mmfw-sysconf-e3250/etc/pulse/system.pa
index 0db3d9d..de6f799 100644..100755
--- a/mmfw-sysconf-e3250/etc/pulse/system.pa
+++ b/mmfw-sysconf-e3250/etc/pulse/system.pa
@@ -19,8 +19,12 @@
 # This startup script is used only if PulseAudio is started in system
 # mode.
 
-load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0 need_audio_pm=1
-load-module module-alsa-source source_name=alsa_input.0.analog-stereo device=hw:0,0 need_audio_pm=1
+### Stream Manager module
+load-module module-stream-mgr ipc_type=pipe
+load-module module-role-ducking global=1 volume=0
+
+load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0 tsched=0
+load-module module-alsa-source source_name=alsa_input.0.analog-stereo device=hw:0,0
 
 ### Automatically load driver modules depending on the hardware available
 .ifexists module-udev-detect.so
@@ -65,7 +69,7 @@ load-module module-rescue-streams
 load-module module-always-sink
 
 ### Automatically suspend sinks/sources that become idle for too long
-load-module module-suspend-on-idle timeout=200 use_audio_pm=1
+load-module module-suspend-on-idle
 
 ### Enable positioned event sounds
 #load-module module-position-event-sounds
diff --git a/mmfw-sysconf-e3250/usr/etc/mmfw_audio_pcm_dump.ini b/mmfw-sysconf-e3250/usr/etc/mmfw_audio_pcm_dump.ini
new file mode 100644
index 0000000..54e2d2e
--- /dev/null
+++ b/mmfw-sysconf-e3250/usr/etc/mmfw_audio_pcm_dump.ini
@@ -0,0 +1,12 @@
+
+[pcm_dump]
+
+# playback
+
+pa_sink                        = n
+pa_sink_input                  = n
+
+# capture
+
+pa_source                      = n
+pa_source_output               = n
diff --git a/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder.ini
index 880ad2f..ad67aba 100644
--- a/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder.ini
@@ -39,10 +39,11 @@ DeviceCount = 2
 ; Input format for image filter
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
 ImageFilterInputFormat = 7
+SupportMediaPacketPreviewCb = 0
 
 [AudioInput]
 ;AudiosrcElement = audiotestsrc | 2,0 | do-timestamp,1 | slave-method,3
-AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | slave-method,3
 AudiomodemsrcElement = voicedatasrcbin | 0,0
 ;AudiomodemsrcElement = dpramsrcbin | 1,0 | blocksize,644
 
@@ -65,7 +66,7 @@ VideoscaleElement = fimcconvert | 0,0
 VideoconvertElement = fimcconvert | 0,0
 
 [VideoEncoder]
-H263 = omx_h263enc | 0,0
+;H263 = omx_h263enc | 0,0
 H264 = omx_h264enc | 0,0
 ;MPEG4 = omx_mpeg4enc | 0,0
 
diff --git a/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder_dev_video_pri.ini
index a3a413a..952a002 100755..100644
--- a/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -25,6 +25,7 @@ InputIndex = 0,-255 || 0
 DeviceName = S5C73M3
 PreviewResolution = 176,144 | 320,240 | 640,480 | 720,480 | 960,720 | 1280,720 | 1440,1080 | 1920,1080 | 2048,1536 || 640,480
 CaptureResolution = 640,480 | 1280,720 | 2048,1152 | 2048,1536 | 3264,1836 | 3264,2176 | 3264,2448 || 3264,2448
+VideoResolution = 176,144 | 320,240 | 640,480 | 720,480 | 960,720 | 1280,720 | 1440,1080 | 1920,1080 | 2048,1536 || 640,480
 FPS = 0,7,10,15,20,24,30,60,90,120 || 30
 ; PictureForamt - MSL value
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
@@ -82,8 +83,8 @@ ColorTone = 1,2,3,6,-255,-255,4,-255,-255,-255,-255,-255,-255,-255,-255,-255,-25
 ; Flip - real setting value
 ;;; 0:NONE, 1:VERTICAL, 2:HORIZONTAL
 ; Flip - MSL value(convert array index)
-;;; 0:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 0
 
 ; Wide Dynamic Range - real setting value
 ;;; 0:OFF, 1:ON
diff --git a/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder_dev_video_sec.ini
index d4f8b01..1f211aa 100644
--- a/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -83,8 +83,9 @@ ColorTone = 1,2,3,6,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,
 ; Flip - real setting value
 ;;; 0:NONE, 1:VERTICAL, 2:HORIZONTAL
 ; Flip - MSL value(convert array index)
-;;; 0:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 0
+
 
 ; Wide Dynamic Range - real setting value
 ;;; N/A
diff --git a/mmfw-sysconf-e3250/usr/etc/mmfw_player.ini b/mmfw-sysconf-e3250/usr/etc/mmfw_player.ini
index 9982ed3..54d61bf 100644
--- a/mmfw-sysconf-e3250/usr/etc/mmfw_player.ini
+++ b/mmfw-sysconf-e3250/usr/etc/mmfw_player.ini
@@ -14,7 +14,7 @@ videosink element fake = fakesink
 
 video converter element = ffmpegcolorspace
 
-audiosink element = avsysaudiosink
+audiosink element = pulsesink
 
 drmsrc element = filesrc
 
@@ -30,9 +30,9 @@ async start = yes
 multiple codec supported = yes
 
 ; parameters for initializing gstreamer
-gstparam1 = --gst-disable-registry-usage
-gstparam2 = --gst-plugin-load=/usr/lib/gstreamer-0.10/libgstxvimagesink.so,/usr/lib/gstreamer-0.10/libgstomx.so,/usr/lib/gstreamer-0.10/libgsttypefindfunctions.so,/usr/lib/gstreamer-0.10/libgstcoreelements.so,/usr/lib/gstreamer-0.10/libgstaudioparsers.so,/usr/lib/gstreamer-0.10/libgstavsyssink.so,/usr/lib/gstreamer-0.10/libgstcoreindexers.so,/usr/lib/gstreamer-0.10/libgstaudioconvert.so,/usr/lib/gstreamer-0.10/libgstaudioresample.so,/usr/lib/gstreamer-0.10/libgstffmpeg.so,/usr/lib/gstreamer-0.10/libgstamrnb.so,/usr/lib/gstreamer-0.10/libgstamrwbdec.so,/usr/lib/gstreamer-0.10/libgstisomp4.so,/usr/lib/gstreamer-0.10/libgstwavparse.so,/usr/lib/gstreamer-0.10/libgstvorbis.so,/usr/lib/gstreamer-0.10/libgstid3demux.so,/usr/lib/gstreamer-0.10/libgstaudioparsers.so
-gstparam3 = --gst-plugin-load=/usr/lib/gstreamer-0.10/libgstogg.so
+;gstparam1 = --gst-disable-registry-usage ; --gst-plugin-load
+gstparam2 =
+gstparam3 =
 gstparam4 =
 gstparam5 =
 
diff --git a/mmfw-sysconf-simulator.mobile/opt/system/mmfw_audio_volume.ini b/mmfw-sysconf-simulator.mobile/opt/system/mmfw_audio_volume.ini
deleted file mode 100644
index c4c686a..0000000
--- a/mmfw-sysconf-simulator.mobile/opt/system/mmfw_audio_volume.ini
+++ /dev/null
@@ -1,41 +0,0 @@
-
-[speaker]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-media                          = 0.00000, 0.01778, 0.02512, 0.03548, 0.05012, 0.07079, 0.08913, 0.11220, 0.14125, 0.17783, 0.22387, 0.28184, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 0.66943, 0.79370, 0.69104, 1.00000, 1.00000, 1.00000, 1.00000, 0.79370, 0.96549
-
-[headset]
-system                         = 0.00000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623
-notification                   = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-alarm                          = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-ringtone                       = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-media                          = 0.00000, 0.00501, 0.01000, 0.01778, 0.03162, 0.05623, 0.07943, 0.11220, 0.14125, 0.17783, 0.22387, 0.28184, 0.35481, 0.44668, 0.63096, 0.89125
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 0.92832, 0.92832, 1.00000, 1.00000, 0.79370, 0.79370, 0.36840, 0.92832, 1.00000
-
-[btheadset]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-media                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000
-
-[hdmi]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-media                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000
-
diff --git a/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_camcorder_dev_video_pri.ini
deleted file mode 100644
index 9d3ab10..0000000
--- a/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ /dev/null
@@ -1,186 +0,0 @@
-; < Camera/Camcorder Configure Control INI file >
-;
-; - SDK Camera. Mega Camera.
-;
-; - Header List -
-; 1.  Camera
-; 2.  Strobe
-; 3.  Effect
-; 4.  Photograph
-; 5.  Capture
-; 6.  Detect
-;
-; - Note -
-; If you want to add a new header,
-; add a new enum value to "enum ConfigureCategoryControl"
-; and new default table for it in mm_camcorder_configure.c/.h
-;
-
-[Camera]
-; Input index - real setting value
-;;; 0:PRIMARY_CAMERA, 1:SECONDARY_CAMERA
-; Input index - MSL value(convert array index)
-;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
-InputIndex = 0,-255 || 0
-DeviceName = virtual driver
-PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-FPS = 30 || 30
-; PictureForamt - MSL value
-;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
-PictureFormat = 4,7,8 || 4
-Overlay = 0,1 || 1
-; Recommend preview format for capture
-;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatCapture = 7
-; Recommend preview format for record
-;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatRecord = 7
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
-RecommendPreviewResolution = 640,480 | 352,288 || 640,480
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 0
-
-
-[Strobe]
-;StrobeControl - Not support
-;StrobeCapabilities - Not support
-; Strobe mode - real setting value
-;;; N/A
-; Strobe mode - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO, 3:REDEYE_REDUCTION, 4:SLOW_SYNC, 5:FRONT_CURTAIN, 6:REAR_CURTAIN, 7:PERMANENT
-StrobeMode = 0,-255,-255,-255,-255,-255,-255,-255 || 0
-;StrobeStatus - Not support
-;StrobeEV - Not support
-
-
-[Effect]
-Brightness = 1,20 || 10
-Contrast = 1,20 || 10
-Saturation = 1,20 || 10
-Sharpness = 1,20 || 10
-
-; White balance - real setting value
-;;; N/A
-; White balance - MSL value(convert array index)
-;;; 0:NONE, 1:AUTO, 2:DAYLIGHT, 3:CLOUDY, 4:FLUOROSCENT, 5:INCANDESCENT, 6:SHADE, 7:HORIZON, 8:FLASH, 9:CUSTOM
-WhiteBalance = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; N/A
-; Color tone - MSL value(convert array index)
-;;; 0:NONE, 1:MONO, 2:SEPIA, 3:NEGATIVE, 4:BLUE, 5:GREEN, 6:AQUA, 7:VIOLET, 8:ORANGE, 9:GRAY, 10:REC,
-;;; 11:ANTIQUE, 12:WARM, 13:PINK, 14:YELLOW, 15:PURPLE, 16:EMBOSS, 17:OUTLINE, 18:SOLARIZATION_1, 19:SOLARIZATION_2, 20:SOLARIZATION_3,
-;;; 21:SOLARIZATION_4, 22:SKETCH_1, 23:SKETCH_2, 24:SKETCH_3, 25:SKETCH_4
-ColorTone = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Flip - real setting value
-;;; 0:NONE, 1:VERTICAL, 2:HORIZONTAL
-; Flip - MSL value(convert array index)
-;;; 0:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
-
-; Wide Dynamic Range - real setting value
-;;; N/A
-; Wide Dynamic Range - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO
-WDR = 0,-255,-255 || 0
-
-; Part color mode - real setting value
-;;; 0:OFF, 1:SWAP, 2:ACCENT
-; Part color mode - MSL value(convert array index)
-;;; 0:OFF, 1:SWAP, 2:ACCENT
-;PartColorMode = 0,1,2 || 0
-
-; Part color - real setting value
-;;; 0:VIOLET, 1:PURPLE, 2:MAGENTA_1, 3:MAGENTA_2, 4:RED_1, 5:RED_2, 6:BROWN, 7:YELLOW, 8:GREEN_1, 9:GREEN_2, 10:GREEN_3, 
-;;; 11:GREEN_4, 12:COBALT, 13:CYAN, 14:BLUE_1, 15:BLUE_2, 16:GRAY
-; Part color - MSL value(convert array index)
-;;; 0:VIOLET, 1:PURPLE, 2:MAGENTA_1, 3:MAGENTA_2, 4:RED_1, 5:RED_2, 6:BROWN, 7:YELLOW, 8:GREEN_1, 9:GREEN_2, 10:GREEN_3, 
-;;; 11:GREEN_4, 12:COBALT_BLUE, 13:CYAN, 14:BLUE_1, 15:BLUE_2, 16:GRAY
-;PartColor = 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 || 0
-
-
-[Photograph]
-;LensInit = 0,1 || 0
-;DigitalZoom = 10,30 || 10
-;OpticalZoom - Not support
-
-; Focus mode - real setting value
-;;; N/A
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = -255,0,-255,-255,-255,-255 || 0
-
-; Auto focus type - real setting value
-;;; N/A
-; Auto focus - MSL value(convert array index)
-;;; 0:NONE, 1:NORMAL, 2:MACRO, 3:FULL
-AFType = 0,-255,-255,-255 || 0
-
-; Auto exposure type - real setting value
-;;; N/A
-; Auto exposure mode - MSL value(convert array index)
-;;; 0,OFF 1,ALL 2,CENTER1  3,CENTER2 4,CENTER3 5,SPOT1 6,SPOT2 7,CUSTOM1 8,CUSTOM2
-AEType = -255,0,-255,-255,-255,-255,-255,-255,-255 || 0
-
-;ExposureValue - Not support
-;FNumber - Not support
-;ShutterSpeed - Not support
-
-; ISO - real setting value
-;;; N/A
-; ISO - MSL value(convert array index)
-;;; 0:AUTO, 1:50, 2:100, 3:200, 4:400, 5:800, 6:1600, 7:3200
-ISO = 0,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Program mode - real setting value
-;;; N/A
-; Program mode - MSL value(convert array index)
-;;; 0:NORMAL, 1:PORTRAIT, 2:LANDSCAPE, 3:SPORTS, 4:PARTY_N_INDOOR, 5:BEACH_N_INDOOR, 6:SUNSET, 7:DUSK_N_DAWN, 8:FALL_COLOR, 9:NIGHT_SCENE,
-;;; 10:FIREWORK, 11:TEXT, 12:SHOW_WINDOW, 13:CANDLE_LIGHT, 14:BACKLIGHT
-ProgramMode = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Anti-handshake - real setting value
-;;; N/A
-; Anti-handshake - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
-AntiHandshake = 0,-255,-255,-255 || 0
-
-; Video-stabilization - real setting value
-;;; 0:OFF, 1:ON
-; Video-stabilization - MSL value(convert array index)
-;;; 0:OFF, 1:ON
-VideoStabilization = 0 || 0
-
-; Face zoom mode
-;;; 0:OFF, 1:ON
-FaceZoomMode = 0 || 0
-; Face zoom level
-FaceZoomLevel = 0,0 || 0
-
-
-[Capture]
-; Output mode
-;;; No need to convert
-;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
-OutputMode = 4,7,8,13 || 13
-JpegQuality = 0,100 || 50
-MultishotNumber = 1,255 || 1
-SensorEncodedCapture = 0
-; Support HDR
-;;; 0: OFF, 1: ON, 2: ON and Original
-SupportHDR = 0,-255,-255 || 0
-
-
-[Detect]
-; Detect mode
-;;; 0:OFF, 1:ON
-DetectMode = 0,-255 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-
diff --git a/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_player.ini b/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_player.ini
deleted file mode 100644
index 8c3d50b..0000000
--- a/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_player.ini
+++ /dev/null
@@ -1,96 +0,0 @@
-[general] 
-
-; if disabled typefind element will used directely 
-use decodebin = no ; async state change problem exist 
-
-use sink handler = yes 
-
-disable segtrap = yes ; same effect with --gst-disable-segtrap 
-
-; set default videosink element according to video surface type(X, EVAS, NULL)
-videosink element x = xvimagesink
-videosink element evas = evasimagesink
-videosink element fake = fakesink
-
-video converter element = ffmpegcolorspace
-
-audiosink element = avsysaudiosink 
-
-drmsrc element = filesrc 
-
-; if yes. gstreamer will not update registry 
-skip rescan = yes 
-delay before repeat = 50 ; msec
-
-; comma separated list of tocken which elemnts has it in it's name will not be used 
-element exclude keyword = maru_, omx_
-
-async start = yes 
-
-multiple codec supported = yes
-
-; parameters for initializing gstreamer 
-gstparam1 = 
-gstparam2 = 
-gstparam3 = 
-gstparam4 = 
-gstparam5 = 
-
-; generating dot file representing pipeline state 
-generate dot = no 
-
-; parameter for clock provide in audiosink 
-provide clock = yes 
-
-; allowed timeout for changing pipeline state 
-live state change timeout = 30 ; sec 
-localplayback state change timeout = 10 ; sec
-
-; delay in msec for sending EOS 
-eos delay = 150 ; msec 
-
-
-[http streaming]
-
-httpsrc element = souphttpsrc
-
-; if set, use file or not use memory for buffering
-http file buffer path = /opt/usr/media
-
-http buffering limit = 99.0 ; percent
-
-http max size bytes = 1048576 ; bytes
-
-http buffering time = 1.2
-
-http timeout = 30 ; sec
-
-
-[rtsp streaming]
-
-rtspsrc element = rtspsrc
-
-rtsp buffering time = 5000; msec
-
-rtsp rebuffering time = 15000; msec
-
-rtsp do typefinding = no; if no, caps on rtspsrc:src pad will be used for autoplugging
-
-rtsp error concealment = yes
-
-
-[hw accelation] 
-use video hw accel = no
-
-
-[priority] 
-
-use priority setting = no 
-
-demux = 95 
-
-videosink = 96 
-
-audiosink = 97
-
-ringbuffer = 98 
diff --git a/mmfw-sysconf-simulator.wearable/etc/asound.conf b/mmfw-sysconf-simulator.wearable/etc/asound.conf
deleted file mode 100644
index 5b99392..0000000
--- a/mmfw-sysconf-simulator.wearable/etc/asound.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# default sound configuration for simulator
-
-pcm. !default {
-	type hw
-	card 0
-}
-
-ctl. !default {
-	type hw
-	card 0
-}
-
-pcm. AIF2{
-	type hw
-	card 0
-	device 1
-}
-
-pcm. AIF3{
-	type hw
-	card 0
-	device 3
-}
diff --git a/mmfw-sysconf-simulator.wearable/etc/pulse/client.conf b/mmfw-sysconf-simulator.wearable/etc/pulse/client.conf
deleted file mode 100644
index 8e0de79..0000000
--- a/mmfw-sysconf-simulator.wearable/etc/pulse/client.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
-
-## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
-## more information. Default values a commented out.  Use either ; or # for
-## commenting.
-
-; default-sink =
-; default-source =
-; default-server =
-
-; autospawn = yes
-; daemon-binary = /usr/bin/pulseaudio
-; extra-arguments = --log-target=syslog
-
-; cookie-file =
-
-; enable-shm = yes
-shm-size-bytes = 2097152 # setting this 0 will use the system-default, usually 64 MiB
diff --git a/mmfw-sysconf-simulator.wearable/etc/pulse/daemon.conf b/mmfw-sysconf-simulator.wearable/etc/pulse/daemon.conf
deleted file mode 100644
index 212390d..0000000
--- a/mmfw-sysconf-simulator.wearable/etc/pulse/daemon.conf
+++ /dev/null
@@ -1,81 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
-
-## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
-## more information. Default values a commented out.  Use either ; or # for
-## commenting.
-
-daemonize = yes
-; fail = yes
-; allow-module-loading = yes
-; allow-exit = yes
-; use-pid-file = yes
-system-instance = yes
-; enable-shm = yes
-; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
-; lock-memory = no
-; cpu-limit = no
-
-; high-priority = yes
-; nice-level = -11
-
-realtime-scheduling = yes
-realtime-priority = 5
-
-; exit-idle-time = 20
-; scache-idle-time = 20
-
-; dl-search-path = (depends on architecture)
-
-; load-default-script-file = yes
-; default-script-file =
-
-log-target = dlog-color
-; log-level = notice
-; log-meta = no
-; log-time = no
-; log-backtrace = 0
-
-resample-method = ffmpeg
-; enable-remixing = yes
-; enable-lfe-remixing = no
-
-; flat-volumes = yes
-
-; rlimit-fsize = -1
-; rlimit-data = -1
-; rlimit-stack = -1
-; rlimit-core = -1
-; rlimit-as = -1
-; rlimit-rss = -1
-; rlimit-nproc = -1
-; rlimit-nofile = 256
-; rlimit-memlock = -1
-; rlimit-locks = -1
-; rlimit-sigpending = -1
-; rlimit-msgqueue = -1
-; rlimit-nice = 31
-; rlimit-rtprio = 9
-; rlimit-rttime = 1000000
-
-; default-sample-format = s16le
-; default-sample-rate = 44100
-; default-sample-channels = 2
-; default-channel-map = front-left,front-right
-
-; default-fragments = 4
-; default-fragment-size-msec = 25
diff --git a/mmfw-sysconf-simulator.wearable/etc/pulse/default.pa b/mmfw-sysconf-simulator.wearable/etc/pulse/default.pa
deleted file mode 100644
index f4807e1..0000000
--- a/mmfw-sysconf-simulator.wearable/etc/pulse/default.pa
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/pulseaudio -nF
-#
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-# This startup script is used only if PulseAudio is started per-user
-# (i.e. not in system mode)
-
-.nofail
-
-### Load something into the sample cache
-#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
-#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
-#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
-#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
-
-.fail
-
-### Automatically restore the volume of streams and devices
-load-module module-device-restore
-load-module module-stream-restore
-load-module module-card-restore
-
-### Automatically augment property information from .desktop files
-### stored in /usr/share/application
-load-module module-augment-properties
-
-### Load audio drivers statically (it's probably better to not load
-### these drivers manually, but instead use module-hal-detect --
-### see below -- for doing this automatically)
-#load-module module-alsa-sink
-#load-module module-alsa-source device=hw:1,0
-#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
-#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
-#load-module module-null-sink
-#load-module module-pipe-sink
-
-### Automatically load driver modules depending on the hardware available
-.ifexists module-udev-detect.so
-#load-module module-udev-detect
-.else
-### Alternatively use the static hardware detection module (for systems that
-### lack udev support)
-#load-module module-detect
-.endif
-
-### Automatically load driver modules for Bluetooth hardware
-.ifexists module-bluetooth-discover.so
-load-module module-bluetooth-discover
-.endif
-
-### Load several protocols
-.ifexists module-esound-protocol-unix.so
-load-module module-esound-protocol-unix
-.endif
-load-module module-native-protocol-unix
-
-### Network access (may be configured with paprefs, so leave this commented
-### here if you plan to use paprefs)
-#load-module module-esound-protocol-tcp
-#load-module module-native-protocol-tcp
-#load-module module-zeroconf-publish
-
-### Load the RTP reciever module (also configured via paprefs, see above)
-#load-module module-rtp-recv
-
-### Load the RTP sender module (also configured via paprefs, see above)
-#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink"
-#load-module module-rtp-send source=rtp.monitor
-
-### Load additional modules from GConf settings. This can be configured with the paprefs tool.
-### Please keep in mind that the modules configured by paprefs might conflict with manually
-### loaded modules.
-.ifexists module-gconf.so
-.nofail
-load-module module-gconf
-.fail
-.endif
-
-### Automatically restore the default sink/source when changed by the user during runtime
-load-module module-default-device-restore
-
-### Automatically move streams to the default sink if the sink they are
-### connected to dies, similar for sources
-load-module module-rescue-streams
-
-### Make sure we always have a sink around, even if it is a null sink.
-load-module module-always-sink
-
-### Honour intended role device property
-load-module module-intended-roles
-
-### Automatically suspend sinks/sources that become idle for too long
-load-module module-suspend-on-idle
-
-### If autoexit on idle is enabled we want to make sure we only quit
-### when no local session needs us anymore.
-load-module module-console-kit
-
-### Enable positioned event sounds
-#load-module module-position-event-sounds
-
-### Cork music streams when a phone stream is active
-#load-module module-cork-music-on-phone
-
-# X11 modules should not be started from default.pa so that one daemon
-# can be shared by multiple sessions.
-
-### Load X11 bell module
-#load-module module-x11-bell sample=bell-windowing-system
-
-### Register ourselves in the X11 session manager
-#load-module module-x11-xsmp
-
-### Publish connection data in the X11 root window
-#.ifexists module-x11-publish.so
-#.nofail
-#load-module module-x11-publish
-#.fail
-#.endif
-
-### Make some devices default
-#set-default-sink output
-#set-default-source input
diff --git a/mmfw-sysconf-simulator.wearable/etc/pulse/system.pa b/mmfw-sysconf-simulator.wearable/etc/pulse/system.pa
deleted file mode 100644
index 02c81c0..0000000
--- a/mmfw-sysconf-simulator.wearable/etc/pulse/system.pa
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/pulseaudio -nF
-#
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-# This startup script is used only if PulseAudio is started in system
-# mode.
-
-load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0 need_audio_pm=0
-load-module module-alsa-source source_name=alsa_input.0.analog-stereo device=hw:0,0 need_audio_pm=0
-
-### Automatically load driver modules depending on the hardware available
-.ifexists module-hal-detect.so
-#load-module module-hal-detect
-.else
-### Alternatively use the static hardware detection module (for systems that
-### lack HAL support)
-#load-module module-detect
-.endif
-
-### Load several protocols
-.ifexists module-esound-protocol-unix.so
-load-module module-esound-protocol-unix
-.endif
-load-module module-native-protocol-unix
-
-#load-module module-bluetooth-discover
-
-### Custom policy module to route between bt<=speaker
-load-module module-policy
-
-### Automatically restore the volume of streams and devices
-#load-module module-stream-restore
-#load-module module-device-restore
-
-### Automatically restore the default sink/source when changed by the user during runtime
-load-module module-default-device-restore
-
-### Automatically move streams to the default sink if the sink they are
-### connected to dies, similar for sources
-load-module module-rescue-streams
-
-### Make sure we always have a sink around, even if it is a null sink.
-load-module module-always-sink
-
-### Automatically suspend sinks/sources that become idle for too long
-#load-module module-suspend-on-idle
-load-module module-suspend-on-idle timeout=1 use_audio_pm=0
-
-### Enable positioned event sounds
-#load-module module-position-event-sounds
-
-### Set default source (not to use alsa_sink monitor which is index 0)
-set-default-source alsa_input.0.analog-stereo
-set-default-sink alsa_output.0.analog-stereo
-
-load-module module-remap-sink sink_name=mono_alsa master=alsa_output.0.analog-stereo channels=1
-load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
diff --git a/mmfw-sysconf-simulator.wearable/opt/system/mmfw_audio_volume.ini b/mmfw-sysconf-simulator.wearable/opt/system/mmfw_audio_volume.ini
deleted file mode 100644
index c4c686a..0000000
--- a/mmfw-sysconf-simulator.wearable/opt/system/mmfw_audio_volume.ini
+++ /dev/null
@@ -1,41 +0,0 @@
-
-[speaker]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-media                          = 0.00000, 0.01778, 0.02512, 0.03548, 0.05012, 0.07079, 0.08913, 0.11220, 0.14125, 0.17783, 0.22387, 0.28184, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 0.66943, 0.79370, 0.69104, 1.00000, 1.00000, 1.00000, 1.00000, 0.79370, 0.96549
-
-[headset]
-system                         = 0.00000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623
-notification                   = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-alarm                          = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-ringtone                       = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-media                          = 0.00000, 0.00501, 0.01000, 0.01778, 0.03162, 0.05623, 0.07943, 0.11220, 0.14125, 0.17783, 0.22387, 0.28184, 0.35481, 0.44668, 0.63096, 0.89125
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 0.92832, 0.92832, 1.00000, 1.00000, 0.79370, 0.79370, 0.36840, 0.92832, 1.00000
-
-[btheadset]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-media                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000
-
-[hdmi]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-media                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000
-
diff --git a/mmfw-sysconf-simulator.wearable/usr/etc/gst-openmax.conf b/mmfw-sysconf-simulator.wearable/usr/etc/gst-openmax.conf
deleted file mode 100644
index 9c0203c..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/etc/gst-openmax.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-omx_mpeg4dec,
-  type=GstOmxMpeg4Dec,
-  library-name=libSEC_OMX_Core.so.0,
-  component-name=OMX.SEC.MPEG4.Decoder,
-  sink="video/mpeg, mpegversion=(int)4, systemstream=false, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-divx, divxversion=(int)[4,5], width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-xvid, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-3ivx, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
-
-omx_h264dec,
-  type=GstOmxH264Dec,
-  library-name=libSEC_OMX_Core.so.0,
-  component-name=OMX.SEC.AVC.Decoder,
-  sink="video/x-h264, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
-
-omx_h263dec,
-  type=GstOmxH263Dec,
-  library-name=libSEC_OMX_Core.so.0,
-  component-name=OMX.SEC.H263.Decoder,
-  sink="video/x-h263, variant=(string)itu, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
-
-omx_wmvdec,
-  type=GstOmxWmvDec,
-  library-name=libSEC_OMX_Core.so.0,
-  component-name=OMX.SEC.WMV.Decoder,
-  sink="video/x-wmv, wmvversion=(int)3, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
-
-omx_mpeg4enc,
-  type=GstOmxMpeg4Enc,
-  library-name=libSEC_OMX_Core.so.0,
-  component-name=OMX.SEC.MPEG4.Encoder,
-  sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  src="video/mpeg, mpegversion=(int)4, systemstream=false, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
-
-omx_h264enc,
-  type=GstOmxH264Enc,
-  library-name=libSEC_OMX_Core.so.0,
-  component-name=OMX.SEC.AVC.Encoder,
-  sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  src="video/x-h264, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
-
-omx_h263enc,
-  type=GstOmxH263Enc,
-  library-name=libSEC_OMX_Core.so.0,
-  component-name=OMX.SEC.H263.Encoder,
-  sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  src="video/x-h263, variant=(string)itu, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0
diff --git a/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_camcorder.ini
deleted file mode 100644
index e6a8af8..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_camcorder.ini
+++ /dev/null
@@ -1,105 +0,0 @@
-; < Camera/Camcorder Configure Main INI file >
-;
-; - SDK Camera
-;
-; - Header List -
-; 1.  General
-; 2.  VideoInput
-; 3.  AudioInput
-; 4.  VideoOutput
-; 5.  Capture
-; 6.  Record
-; 7.  VideoEncoder
-; 8.  AudioEncoder
-; 9.  ImageEncoder
-; 10. Mux
-;
-; - Note -
-; If you want to add a new header,
-; add a new enum value to "enum ConfigureCategoryMain"
-; and new default table for it in mm_camcorder_configure.c/.h
-;
-
-[General]
-SyncStateChange = 1
-;GSTInitOption = --gst-enable-tiny-registry --gst-disable-segtrap || NOT-USE-DEFAULT_VALUE
-;GSTInitOption = --gst-debug=3,avsysvideosrc:4 || NOT-USE-DEFAULT_VALUE
-ModelName = TIZEN_SDK
-;DisabledAttributes = camera-optical-zoom camera-af-touch-x camera-af-touch-y camera-exposure-value camera-f-number camera-shutter-speed camera-hold-af-after-capturing filter-flip filter-hue display-src-x display-src-y display-src-width display-src-height tag-image-description strobe-control strobe-capabilities strobe-mode detect-mode detect-number detect-focus-select detect-select-number detect-status || NO_DEFAULT_VALUE
-
-[VideoInput]
-UseConfCtrl = 1
-ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini
-ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini
-VideosrcElement = v4l2src | 1,1 | do-timestamp,1 | device,/dev/video0
-UseVideoscale = 0
-VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
-UseZeroCopyFormat = 0
-DeviceCount = 2
-
-[AudioInput]
-AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,2
-AudiomodemsrcElement = audiotestsrc | 2,0 | do-timestamp,1 | is-live,1
-
-[VideoOutput]
-; DisplayDevice
-;;; 0: MAIN LCD, 1: SUB LCD, 2:TV OUT, 3: MAIN LCD and SUB LCD, 4: MAIN LCD and TV OUT
-DisplayDevice = 0 || 0
-; Videosink
-;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface
-Videosink = 0,1,3 || 0
-VideosinkElementX = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-buffer,0 | qos,0 | sync,0 | show-preroll-frame,0
-VideosinkElementEvas = evasimagesink | 4,0 | enable-last-buffer,0 | qos,0 | sync,0 | show-preroll-frame,0
-VideosinkElementNull = fakesink | 3,0 | qos,0 | sync,0 | enable-last-buffer,0
-UseVideoscale = 0
-VideoscaleElement = videoscale | 1,0 | method,1
-
-[VideoEncoder]
-H263 = maru_h263penc | 0,0
-MPEG4 = maru_mpeg4enc | 0,0
-THEORA = theoraenc | 1,0 | num-bufs,4
-
-[AudioEncoder]
-AMR = amrnbenc | 0,0
-AAC = ffenc_aac | 0,0
-WAVE = wavenc | 0,0
-VORBIS = vorbisenc | 0,0
-
-[ImageEncoder]
-JPEG = jpegenc | 0,0
-PNG = pngenc | 0,0
-
-[Capture]
-UseEncodebin = 1
-UseCaptureMode = 0
-VideoscaleElement = videoscale | 1,0 | method,1
-PlayCaptureSound = 0
-
-[Record]
-UseAudioEncoderQueue = 1
-UseVideoEncoderQueue = 1
-VideoProfile = 0
-VideoAutoAudioConvert = 1
-VideoAutoAudioResample = 0
-VideoAutoColorSpace = 0
-AudioProfile = 1
-AudioAutoAudioConvert = 1
-AudioAutoAudioResample = 0
-AudioAutoColorSpace = 0
-ImageProfile = 2
-ImageAutoAudioConvert = 0
-ImageAutoAudioResample = 0
-ImageAutoColorSpace = 0
-RecordsinkElement = filesink | 1,0 | async,0
-UseNoiseSuppressor = 0
-DropVideoFrame = 0
-PassFirstVideoFrame = 0
-
-[Mux]
-3GP = ffmux_3gp | 0,0
-AMR = ffmux_amr | 0,0
-MP4 = ffmux_mp4 | 0,0
-OGG = oggmux | 0,0
-WAV = wavenc | 0,0
-AAC = ffmux_adts | 0,0
-
diff --git a/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_camcorder_dev_video_sec.ini
deleted file mode 100644
index c4e49c4..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ /dev/null
@@ -1,187 +0,0 @@
-; < Camera/Camcorder Configure Control INI file >
-;
-; - SDK Camera - VGA Camera
-;
-; - Header List -
-; 1.  Camera
-; 2.  Strobe
-; 3.  Effect
-; 4.  Photograph
-; 5.  Capture
-; 6.  Detect
-;
-; - Note -
-; If you want to add a new header,
-; add a new enum value to "enum ConfigureCategoryControl"
-; and new default table for it in mm_camcorder_configure.c/.h
-;
-
-[Camera]
-; Input index - real setting value
-;;; 0:PRIMARY_CAMERA, 1:SECONDARY_CAMERA
-; Input index - MSL value(convert array index)
-;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
-InputIndex = -255,0 || 0
-DeviceName = virtual driver
-PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-FPS = 30 || 30
-; PictureForamt - MSL value
-;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
-PictureFormat = 4,7,8 || 4
-Overlay = 0,1 || 1
-; Recommend preview format for capture
-;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatCapture = 7
-; Recommend preview format for record
-;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatRecord = 7
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
-RecommendPreviewResolution = 640,480 | 352,288 || 640,480
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 0
-
-
-[Strobe]
-;StrobeControl - Not support
-;StrobeCapabilities - Not support
-; Strobe mode - real setting value
-;;; N/A
-; Strobe mode - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO, 3:REDEYE_REDUCTION, 4:SLOW_SYNC, 5:FRONT_CURTAIN, 6:REAR_CURTAIN, 7:PERMANENT
-StrobeMode = 0,-255,-255,-255,-255,-255,-255,-255 || 0
-;StrobeStatus - Not support
-;StrobeEV - Not support
-
-
-[Effect]
-Brightness = 1,20 || 10
-Contrast = 1,20 || 10
-Saturation = 1,20 || 10
-Sharpness = 1,20 || 10
-
-; White balance - real setting value
-;;; N/A
-; White balance - MSL value(convert array index)
-;;; 0:NONE, 1:AUTO, 2:DAYLIGHT, 3:CLOUDY, 4:FLUOROSCENT, 5:INCANDESCENT, 6:SHADE, 7:HORIZON, 8:FLASH, 9:CUSTOM
-WhiteBalance = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; N/A
-; Color tone - MSL value(convert array index)
-;;; 0:NONE, 1:MONO, 2:SEPIA, 3:NEGATIVE, 4:BLUE, 5:GREEN, 6:AQUA, 7:VIOLET, 8:ORANGE, 9:GRAY, 10:REC,
-;;; 11:ANTIQUE, 12:WARM, 13:PINK, 14:YELLOW, 15:PURPLE, 16:EMBOSS, 17:OUTLINE, 18:SOLARIZATION_1, 19:SOLARIZATION_2, 20:SOLARIZATION_3,
-;;; 21:SOLARIZATION_4, 22:SKETCH_1, 23:SKETCH_2, 24:SKETCH_3, 25:SKETCH_4
-ColorTone = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Flip - real setting value
-;;; 0:NONE, 1:VERTICAL, 2:HORIZONTAL
-; Flip - MSL value(convert array index)
-;;; 0:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
-
-; Wide Dynamic Range - real setting value
-;;; N/A
-; Wide Dynamic Range - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO
-WDR = 0,-255,-255 || 0
-
-; Part color mode - real setting value
-;;; 0:OFF, 1:SWAP, 2:ACCENT
-; Part color mode - MSL value(convert array index)
-;;; 0:OFF, 1:SWAP, 2:ACCENT
-;PartColorMode = 0,1,2 || 0
-
-; Part color - real setting value
-;;; 0:VIOLET, 1:PURPLE, 2:MAGENTA_1, 3:MAGENTA_2, 4:RED_1, 5:RED_2, 6:BROWN, 7:YELLOW, 8:GREEN_1, 9:GREEN_2, 10:GREEN_3, 
-;;; 11:GREEN_4, 12:COBALT, 13:CYAN, 14:BLUE_1, 15:BLUE_2, 16:GRAY
-; Part color - MSL value(convert array index)
-;;; 0:VIOLET, 1:PURPLE, 2:MAGENTA_1, 3:MAGENTA_2, 4:RED_1, 5:RED_2, 6:BROWN, 7:YELLOW, 8:GREEN_1, 9:GREEN_2, 10:GREEN_3, 
-;;; 11:GREEN_4, 12:COBALT_BLUE, 13:CYAN, 14:BLUE_1, 15:BLUE_2, 16:GRAY
-;PartColor = 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 || 0
-
-
-[Photograph]
-;LensInit = 0,1 || 0
-;DigitalZoom = 10,30 || 10
-;OpticalZoom - Not support
-
-; Focus mode - real setting value
-;;; N/A
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = -255,0,-255,-255,-255,-255 || 0
-
-; Auto focus type - real setting value
-;;; N/A
-; Auto focus - MSL value(convert array index)
-;;; 0:NONE, 1:NORMAL, 2:MACRO, 3:FULL
-AFType = 0,-255,-255,-255 || 0
-
-; Auto exposure type - real setting value
-;;; N/A
-; Auto exposure mode - MSL value(convert array index)
-;;; 0,OFF 1,ALL 2,CENTER1  3,CENTER2 4,CENTER3 5,SPOT1 6,SPOT2 7,CUSTOM1 8,CUSTOM2
-AEType = -255,0,-255,-255,-255,-255,-255,-255,-255 || 0
-
-;ExposureValue - Not support
-;FNumber - Not support
-;ShutterSpeed - Not support
-
-; ISO - real setting value
-;;; N/A
-; ISO - MSL value(convert array index)
-;;; 0:AUTO, 1:50, 2:100, 3:200, 4:400, 5:800, 6:1600, 7:3200
-ISO = 0,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Program mode - real setting value
-;;; N/A
-; Program mode - MSL value(convert array index)
-;;; 0:NORMAL, 1:PORTRAIT, 2:LANDSCAPE, 3:SPORTS, 4:PARTY_N_INDOOR, 5:BEACH_N_INDOOR, 6:SUNSET, 7:DUSK_N_DAWN, 8:FALL_COLOR, 9:NIGHT_SCENE,
-;;; 10:FIREWORK, 11:TEXT, 12:SHOW_WINDOW, 13:CANDLE_LIGHT, 14:BACKLIGHT
-ProgramMode = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Anti-handshake - real setting value
-;;; N/A
-; Anti-handshake - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
-AntiHandshake = 0,-255,-255,-255 || 0
-
-; Video-stabilization - real setting value
-;;; 0:OFF, 1:ON
-; Video-stabilization - MSL value(convert array index)
-;;; 0:OFF, 1:ON
-VideoStabilization = 0 || 0
-
-; Face zoom mode
-;;; 0:OFF, 1:ON
-FaceZoomMode = 0 || 0
-; Face zoom level
-FaceZoomLevel = 0,0 || 0
-
-
-[Capture]
-; Output mode
-;;; No need to convert
-;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
-OutputMode = 4,7,8,13 || 13
-JpegQuality = 0,100 || 50
-MultishotNumber = 1,255 || 1
-SensorEncodedCapture = 0
-; Support HDR
-;;; 0: OFF, 1: ON, 2: ON and Original
-SupportHDR = 0,-255,-255 || 0
-
-
-[Detect]
-; Detect mode
-;;; No need to convert
-;;; 0:OFF, 1:ON
-DetectMode = 0,-255 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-
diff --git a/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_player.ini b/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_player.ini
deleted file mode 100644
index 8c3d50b..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_player.ini
+++ /dev/null
@@ -1,96 +0,0 @@
-[general] 
-
-; if disabled typefind element will used directely 
-use decodebin = no ; async state change problem exist 
-
-use sink handler = yes 
-
-disable segtrap = yes ; same effect with --gst-disable-segtrap 
-
-; set default videosink element according to video surface type(X, EVAS, NULL)
-videosink element x = xvimagesink
-videosink element evas = evasimagesink
-videosink element fake = fakesink
-
-video converter element = ffmpegcolorspace
-
-audiosink element = avsysaudiosink 
-
-drmsrc element = filesrc 
-
-; if yes. gstreamer will not update registry 
-skip rescan = yes 
-delay before repeat = 50 ; msec
-
-; comma separated list of tocken which elemnts has it in it's name will not be used 
-element exclude keyword = maru_, omx_
-
-async start = yes 
-
-multiple codec supported = yes
-
-; parameters for initializing gstreamer 
-gstparam1 = 
-gstparam2 = 
-gstparam3 = 
-gstparam4 = 
-gstparam5 = 
-
-; generating dot file representing pipeline state 
-generate dot = no 
-
-; parameter for clock provide in audiosink 
-provide clock = yes 
-
-; allowed timeout for changing pipeline state 
-live state change timeout = 30 ; sec 
-localplayback state change timeout = 10 ; sec
-
-; delay in msec for sending EOS 
-eos delay = 150 ; msec 
-
-
-[http streaming]
-
-httpsrc element = souphttpsrc
-
-; if set, use file or not use memory for buffering
-http file buffer path = /opt/usr/media
-
-http buffering limit = 99.0 ; percent
-
-http max size bytes = 1048576 ; bytes
-
-http buffering time = 1.2
-
-http timeout = 30 ; sec
-
-
-[rtsp streaming]
-
-rtspsrc element = rtspsrc
-
-rtsp buffering time = 5000; msec
-
-rtsp rebuffering time = 15000; msec
-
-rtsp do typefinding = no; if no, caps on rtspsrc:src pad will be used for autoplugging
-
-rtsp error concealment = yes
-
-
-[hw accelation] 
-use video hw accel = no
-
-
-[priority] 
-
-use priority setting = no 
-
-demux = 95 
-
-videosink = 96 
-
-audiosink = 97
-
-ringbuffer = 98 
diff --git a/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_player_audio_effect.ini b/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_player_audio_effect.ini
deleted file mode 100644
index 1394608..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_player_audio_effect.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[audio effect]
-; name of audio effect element
-audio effect element = audioeq
-
-; preset audio effect setting
-audio effect preset = no
-
-; custom audio effect setting (EQ/extension)
-audio effect custom = yes
-audio effect custom list = 0
-
-audio effect custom eq band num = 7 ; number of EQ bands
-audio effect custom eq band width = 33, 90, 242, 649, 1743, 4676, 12544 ; list of each EQ band width (Hz)
-audio effect custom eq band freq = 36, 98, 265, 711, 1907, 5117, 13727 ; list of each EQ band central frequency (Hz)
-
-audio effect custom min list = -12 ; list of minimum level value (the first element is for EQ, others for extension effect)
-audio effect custom max list = 12 ; list of maximum level value (the first element is for EQ, others for extension effect)
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf
deleted file mode 100644
index db78eb4..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; For devices where an 'Aux' element exists
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 90
-name = analog-input
-
-[Element Capture]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Mic]
-switch = off
-volume = off
-
-[Element Line]
-switch = off
-volume = off
-
-[Element Aux]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Video]
-switch = off
-volume = off
-
-[Element Mic/Line]
-switch = off
-volume = off
-
-[Element TV Tuner]
-switch = off
-volume = off
-
-[Element FM]
-switch = off
-volume = off
-
-.include analog-input.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf
deleted file mode 100644
index baf674a..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; For devices where an 'FM' element exists
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 70
-name = analog-input-radio
-
-[Element Capture]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Mic]
-switch = off
-volume = off
-
-[Element Line]
-switch = off
-volume = off
-
-[Element Aux]
-switch = off
-volume = off
-
-[Element Video]
-switch = off
-volume = off
-
-[Element Mic/Line]
-switch = off
-volume = off
-
-[Element TV Tuner]
-switch = off
-volume = off
-
-[Element FM]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-.include analog-input.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf
deleted file mode 100644
index 4be5722..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; For devices where a 'Line' element exists
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 90
-
-[Element Capture]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Mic]
-switch = off
-volume = off
-
-[Element Line]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Aux]
-switch = off
-volume = off
-
-[Element Video]
-switch = off
-volume = off
-
-[Element Mic/Line]
-switch = off
-volume = off
-
-[Element TV Tuner]
-switch = off
-volume = off
-
-[Element FM]
-switch = off
-volume = off
-
-.include analog-input.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf
deleted file mode 100644
index f7f3085..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; For devices where a 'Mic/Line' element exists
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 90
-name = analog-input
-
-[Element Capture]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Mic]
-switch = off
-volume = off
-
-[Element Line]
-switch = off
-volume = off
-
-[Element Aux]
-switch = off
-volume = off
-
-[Element Video]
-switch = off
-volume = off
-
-[Element Mic/Line]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element TV Tuner]
-switch = off
-volume = off
-
-[Element FM]
-switch = off
-volume = off
-
-.include analog-input.conf.common
-.include analog-input-mic.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf
deleted file mode 100644
index 2a36f2f..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; For devices where a 'Mic' element exists
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 100
-name = analog-input-microphone
-
-[Element Capture]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Mic]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Line]
-switch = off
-volume = off
-
-[Element Aux]
-switch = off
-volume = off
-
-[Element Video]
-switch = off
-volume = off
-
-[Element Mic/Line]
-switch = off
-volume = off
-
-[Element TV Tuner]
-switch = off
-volume = off
-
-[Element FM]
-switch = off
-volume = off
-
-.include analog-input.conf.common
-.include analog-input-mic.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf.common b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf.common
deleted file mode 100644
index b35e7af..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf.common
+++ /dev/null
@@ -1,63 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Common element for all microphone inputs
-;
-; See analog-output.conf.common for an explanation on the directives
-
-;;; 'Mic Select'
-
-[Element Mic Select]
-enumeration = select
-
-[Option Mic Select:Mic1]
-name = input-microphone
-priority = 20
-
-[Option Mic Select:Mic2]
-name = input-microphone
-priority = 19
-
-;;; Various Boosts
-
-[Element Mic Boost (+20dB)]
-switch = select
-volume = merge
-
-[Option Mic Boost (+20dB):on]
-name = input-boost-on
-
-[Option Mic Boost (+20dB):off]
-name = input-boost-off
-
-[Element Mic Boost]
-switch = select
-volume = merge
-
-[Option Mic Boost:on]
-name = input-boost-on
-
-[Option Mic Boost:off]
-name = input-boost-off
-
-[Element Front Mic Boost]
-switch = select
-
-[Option Front Mic Boost:on]
-name = input-boost-on
-
-[Option Front Mic Boost:off]
-name = input-boost-off
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-tvtuner.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-tvtuner.conf
deleted file mode 100644
index 8531ec7..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-tvtuner.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; For devices where a 'TV Tuner' element exists
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 70
-name = analog-input-video
-
-[Element Capture]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Mic]
-switch = off
-volume = off
-
-[Element Line]
-switch = off
-volume = off
-
-[Element Aux]
-switch = off
-volume = off
-
-[Element Video]
-switch = off
-volume = off
-
-[Element Mic/Line]
-switch = off
-volume = off
-
-[Element TV Tuner]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element FM]
-switch = off
-volume = off
-
-.include analog-input.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-video.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-video.conf
deleted file mode 100644
index 74c76f0..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input-video.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; For devices where a 'Video' element exists
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 70
-
-[Element Capture]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Mic]
-switch = off
-volume = off
-
-[Element Line]
-switch = off
-volume = off
-
-[Element Aux]
-switch = off
-volume = off
-
-[Element Video]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Mic/Line]
-switch = off
-volume = off
-
-[Element TV Tuner]
-switch = off
-volume = off
-
-[Element FM]
-switch = off
-volume = off
-
-.include analog-input.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf
deleted file mode 100644
index 5055f90..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; A fallback for devices that lack seperate Mic/Line/Aux/Video/TV
-; Tuner/FM elements
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 100
-
-[Element Capture]
-required = volume
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Mic]
-required-absent = any
-
-[Element Line]
-required-absent = any
-
-[Element Aux]
-required-absent = any
-
-[Element Video]
-required-absent = any
-
-[Element Mic/Line]
-required-absent = any
-
-[Element TV Tuner]
-required-absent = any
-
-[Element FM]
-required-absent = any
-
-.include analog-input.conf.common
-.include analog-input-mic.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf.common b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf.common
deleted file mode 100644
index 951e11f..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf.common
+++ /dev/null
@@ -1,294 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Mixer path for PulseAudio's ALSA backend, common elements for all
-; input paths. If multiple options by the same id are discovered they
-; will be suffixed with a number to distuingish them, in the same
-; order they appear here.
-;
-; Source selection should use the following names:
-;
-;       input                       -- If we don't know the exact kind of input
-;       input-microphone
-;       input-microphone-internal
-;       input-microphone-external
-;       input-linein
-;       input-video
-;       input-radio
-;       input-docking-microphone
-;       input-docking-linein
-;       input-docking
-;
-;  We explicitly don't want to wrap the following sources:
-;
-;       CD
-;       Synth/MIDI
-;       Phone
-;       Mix
-;       Digital/SPDIF
-;       Master
-;       PC Speaker
-;
-; See analog-output.conf.common for an explanation on the directives
-
-;;; 'Input Source Select'
-
-[Element Input Source Select]
-enumeration = select
-
-[Option Input Source Select:Input1]
-name = input
-priority = 10
-
-[Option Input Source Select:Input2]
-name = input
-priority = 5
-
-;;; 'Input Source'
-
-[Element Input Source]
-enumeration = select
-
-[Option Input Source:Mic]
-name = input-microphone
-priority = 20
-
-[Option Input Source:Microphone]
-name = input-microphone
-priority = 20
-
-[Option Input Source:Front Mic]
-name = input-microphone
-priority = 19
-
-[Option Input Source:Front Microphone]
-name = input-microphone
-priority = 19
-
-[Option Input Source:Internal Mic]
-name = input-microphone
-priority = 19
-
-[Option Input Source:Line]
-name = input-linein
-priority = 18
-
-[Option Input Source:Line-In]
-name = input-linein
-priority = 18
-
-[Option Input Source:Line In]
-name = input-linein
-priority = 18
-
-[Option Input Source:Docking-Station]
-name = input-docking
-priority = 17
-
-[Option Input Source:AUX IN]
-name = input
-priority = 10
-
-;;; 'Capture Source'
-
-[Element Capture Source]
-enumeration = select
-
-[Option Capture Source:TV Tuner]
-name = input-video
-
-[Option Capture Source:FM]
-name = input-radio
-
-[Option Capture Source:Mic/Line]
-name = input
-
-[Option Capture Source:Line/Mic]
-name = input
-
-[Option Capture Source:Mic]
-name = input-microphone
-
-[Option Capture Source:Microphone]
-name = input-microphone
-
-[Option Capture Source:Int Mic]
-name = input-microphone-internal
-
-[Option Capture Source:Int DMic]
-name = input-microphone-internal
-
-[Option Capture Source:Internal Mic]
-name = input-microphone-internal
-
-[Option Capture Source:iMic]
-name = input-microphone-internal
-
-[Option Capture Source:i-Mic]
-name = input-microphone-internal
-
-[Option Capture Source:Internal Microphone]
-name = input-microphone-internal
-
-[Option Capture Source:Front Mic]
-name = input-microphone
-
-[Option Capture Source:Front Microphone]
-name = input-microphone
-
-[Option Capture Source:Rear Mic]
-name = input-microphone
-
-[Option Capture Source:Mic1]
-name = input-microphone
-
-[Option Capture Source:Mic2]
-name = input-microphone
-
-[Option Capture Source:D-Mic]
-name = input-microphone
-
-[Option Capture Source:IntMic]
-name = input-microphone-internal
-
-[Option Capture Source:ExtMic]
-name = input-microphone-external
-
-[Option Capture Source:Ext Mic]
-name = input-microphone-external
-
-[Option Capture Source:E-Mic]
-name = input-microphone-external
-
-[Option Capture Source:e-Mic]
-name = input-microphone-external
-
-[Option Capture Source:LineIn]
-name = input-linein
-
-[Option Capture Source:Analog]
-name = input
-
-[Option Capture Source:Line]
-name = input-linein
-
-[Option Capture Source:Line-In]
-name = input-linein
-
-[Option Capture Source:Line In]
-name = input-linein
-
-[Option Capture Source:Video]
-name = input-video
-
-[Option Capture Source:Aux]
-name = input
-
-[Option Capture Source:Aux0]
-name = input
-
-[Option Capture Source:Aux1]
-name = input
-
-[Option Capture Source:Aux2]
-name = input
-
-[Option Capture Source:Aux3]
-name = input
-
-[Option Capture Source:AUX IN]
-name = input
-
-[Option Capture Source:Aux In]
-name = input
-
-[Option Capture Source:AOUT]
-name = input
-
-[Option Capture Source:AUX]
-name = input
-
-[Option Capture Source:Cam Mic]
-name = input-microphone
-
-[Option Capture Source:Digital Mic]
-name = input-microphone
-
-[Option Capture Source:Digital Mic 1]
-name = input-microphone
-
-[Option Capture Source:Digital Mic 2]
-name = input-microphone
-
-[Option Capture Source:Analog Inputs]
-name = input
-
-[Option Capture Source:Unknown1]
-name = input
-
-[Option Capture Source:Unknown2]
-name = input
-
-[Option Capture Source:Docking-Station]
-name = input-docking
-
-[Option Capture Source:Dock Mic]
-name = input-docking-microphone
-
-;;; 'Mic Jack Mode'
-
-[Element Mic Jack Mode]
-enumeration = select
-
-[Option Mic Jack Mode:Mic In]
-name = input-microphone
-
-[Option Mic Jack Mode:Line In]
-name = input-linein
-
-;;; 'Digital Input Source'
-
-[Element Digital Input Source]
-enumeration = select
-
-[Option Digital Input Source:Analog Inputs]
-name = input
-
-[Option Digital Input Source:Digital Mic 1]
-name = input-microphone
-
-[Option Digital Input Source:Digital Mic 2]
-name = input-microphone
-
-;;; Various Boosts
-
-[Element Capture Boost]
-switch = select
-
-[Option Capture Boost:on]
-name = input-boost-on
-
-[Option Capture Boost:off]
-name = input-boost-off
-
-[Element Auto Gain Control]
-switch = select
-
-[Option Auto Gain Control:on]
-name = input-agc-on
-
-[Option Auto Gain Control:off]
-name = input-agc-off
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf
deleted file mode 100644
index f2fd31c..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Path for mixers that have a 'Headphone2' control
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 89
-
-[Element Hardware Master]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master Mono]
-switch = off
-volume = off
-
-; This profile path is intended to control the second headphones, not
-; the first headphones. But it should not hurt if we leave the
-; headphone jack enabled nonetheless.
-[Element Headphone]
-switch = mute
-volume = zero
-
-[Element Headphone2]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Speaker]
-switch = off
-volume = off
-
-[Element Front]
-switch = off
-volume = off
-
-[Element Rear]
-switch = off
-volume = off
-
-[Element Surround]
-switch = off
-volume = off
-
-[Element Side]
-switch = off
-volume = off
-
-[Element Center]
-switch = off
-volume = off
-
-[Element LFE]
-switch = off
-volume = off
-
-.include analog-output.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf
deleted file mode 100644
index 2131cfe..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Path for mixers that have a 'Headphone' control
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 90
-
-[Element Hardware Master]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master Mono]
-switch = off
-volume = off
-
-[Element Headphone]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-; This profile path is intended to control the first headphones, not
-; the second headphones. But it should not hurt if we leave the second
-; headphone jack enabled nonetheless.
-[Element Headphone2]
-switch = mute
-volume = zero
-
-[Element Speaker]
-switch = off
-volume = off
-
-[Element Front]
-switch = off
-volume = off
-
-[Element Rear]
-switch = off
-volume = off
-
-[Element Surround]
-switch = off
-volume = off
-
-[Element Side]
-switch = off
-volume = off
-
-[Element Center]
-switch = off
-volume = off
-
-[Element LFE]
-switch = off
-volume = off
-
-.include analog-output.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-lfe-on-mono.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-lfe-on-mono.conf
deleted file mode 100644
index 0a43e27..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-lfe-on-mono.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Intended for usage in laptops that have a seperate LFE speaker
-; connected to the Master mono connector
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 40
-
-[Element Hardware Master]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master]
-switch = mute
-volume = merge
-override-map.1 = all-no-lfe
-override-map.2 = all-left,all-right
-
-[Element Master Mono]
-required = any
-switch = mute
-volume = merge
-override-map.1 = lfe
-override-map.2 = lfe,lfe
-
-; This profile path is intended to control the speaker, not the
-; headphones. But it should not hurt if we leave the headphone jack
-; enabled nonetheless.
-[Element Headphone]
-switch = mute
-volume = zero
-
-[Element Headphone2]
-switch = mute
-volume = zero
-
-[Element Speaker]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Front]
-switch = off
-volume = off
-
-[Element Rear]
-switch = off
-volume = off
-
-[Element Surround]
-switch = off
-volume = off
-
-[Element Side]
-switch = off
-volume = off
-
-[Element Center]
-switch = off
-volume = off
-
-[Element LFE]
-switch = off
-volume = off
-
-.include analog-output.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf
deleted file mode 100644
index 542edc4..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Intended for usage on boards that have a seperate Mono output plug.
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 50
-
-[Element Hardware Master]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master]
-switch = off
-volume = off
-
-[Element Master Mono]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-; This profile path is intended to control the speaker, not the
-; headphones. But it should not hurt if we leave the headphone jack
-; enabled nonetheless.
-[Element Headphone]
-switch = mute
-volume = zero
-
-[Element Headphone2]
-switch = mute
-volume = zero
-
-[Element Speaker]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Front]
-switch = off
-volume = off
-
-[Element Rear]
-switch = off
-volume = off
-
-[Element Surround]
-switch = off
-volume = off
-
-[Element Side]
-switch = off
-volume = off
-
-[Element Center]
-switch = off
-volume = off
-
-[Element LFE]
-switch = off
-volume = off
-
-.include analog-output.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf
deleted file mode 100644
index aea7853..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf
+++ /dev/null
@@ -1,94 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Path for mixers that have a 'Speaker' control
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 100
-
-[Element Hardware Master]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master Mono]
-switch = off
-volume = off
-
-; This profile path is intended to control the speaker, not the
-; headphones. But it should not hurt if we leave the headphone jack
-; enabled nonetheless.
-[Element Headphone]
-switch = mute
-volume = zero
-
-[Element Headphone2]
-switch = mute
-volume = zero
-
-[Element Speaker]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Front]
-switch = mute
-volume = merge
-override-map.1 = all-front
-override-map.2 = front-left,front-right
-
-[Element Rear]
-switch = mute
-volume = merge
-override-map.1 = all-rear
-override-map.2 = rear-left,rear-right
-
-[Element Surround]
-switch = mute
-volume = merge
-override-map.1 = all-rear
-override-map.2 = rear-left,rear-right
-
-[Element Side]
-switch = mute
-volume = merge
-override-map.1 = all-side
-override-map.2 = side-left,side-right
-
-[Element Center]
-switch = mute
-volume = merge
-override-map.1 = all-center
-override-map.2 = all-center,all-center
-
-[Element LFE]
-switch = mute
-volume = merge
-override-map.1 = lfe
-override-map.2 = lfe,lfe
-
-.include analog-output.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf
deleted file mode 100644
index fc30800..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Intended for the 'default' output. Note that a-o-speaker.conf has a
-; higher priority than this
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 99
-
-[Element Hardware Master]
-switch = ignore
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master]
-switch = ignore
-volume = ignore
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master Mono]
-switch = off
-volume = off
-
-; This profile path is intended to control the default output, not the
-; headphones. But it should not hurt if we leave the headphone jack
-; enabled nonetheless.
-[Element Headphone]
-switch = ignore
-volume = zero
-
-[Element Headphone2]
-switch = ignore
-volume = zero
-
-[Element Speaker]
-switch = ignore
-volume = off
-
-[Element Front]
-switch = ignore
-volume = merge
-override-map.1 = all-front
-override-map.2 = front-left,front-right
-
-[Element Rear]
-switch = ignore
-volume = merge
-override-map.1 = all-rear
-override-map.2 = rear-left,rear-right
-
-[Element Surround]
-switch = ignore
-volume = merge
-override-map.1 = all-rear
-override-map.2 = rear-left,rear-right
-
-[Element Side]
-switch = ignore
-volume = merge
-override-map.1 = all-side
-override-map.2 = side-left,side-right
-
-[Element Center]
-switch = ignore
-volume = merge
-override-map.1 = all-center
-override-map.2 = all-center,all-center
-
-[Element LFE]
-switch = ignore
-volume = merge
-override-map.1 = lfe
-override-map.2 = lfe,lfe
-
-.include analog-output.conf.common
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common
deleted file mode 100644
index 90c2bb0..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common
+++ /dev/null
@@ -1,128 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Common part of all paths
-
-; So here's generally how mixer paths are used by PA: PA goes through
-; a mixer path file from top to bottom and checks if a mixer element
-; described therein exists. If so it is added to the list of mixer
-; elements PA will control, keeping the order it read them in. If a
-; mixer element described here has set the required= or
-; required-absent= directives a path might not be accepted as valid
-; and is ignored in its entirety (see below). However usually if a
-; element listed here is missing this one element is ignored but not
-; the entire path.
-;
-; When a device shall be muted/unmuted *all* elements listed in a path
-; file with "switch = mute" will be toggled.
-;
-; When a device shall change its volume, PA will got through the list
-; of all elements with "volume = merge" and set the volume on the
-; first element. If that element does not support dB volumes, this is
-; where the story ends. If it does support dB volumes, PA divides the
-; requested volume by the volume that was set on this element, and
-; then go on to the next element with "volume = merge" and then set
-; that there, and so on.  That way the first volume element in the
-; path will be the one that does the 'biggest' part of the overall
-; volume adjustment, with the remaining elements usually being set to
-; some value next to 0dB. This logic makes sure we get the full range
-; over all volume sliders and a very high granularity of volumes
-; already in hardware.
-;
-; All switches and enumerations set to "select" are exposed via the
-; "port" functionality of sinks/sources. Basically every possible
-; switch setting and every possible enumeration setting will be
-; combined and made into a "port". So make sure you don't list too
-; many switches/enums for exposing, because the number of ports might
-; rise exponentially.
-;
-; Only one path can be selected at a time. All paths that are valid
-; for an audio device will be exposed as "port" for the sink/source.
-
-
-; [General]
-; priority = ...                         # Priority for this path
-; description = ...
-;
-; [Option ...:...]                       # For each option of an enumeration or switch element
-;                                        # that shall be exposed as a sink/source port. Needs to
-;                                        # be named after the Element, followed by a colon, followed
-;                                        # by the option name, resp. on/off if the element is a switch.
-; name = ...                             # Logical name to use in the path identifier
-; priority = ...                         # Priority if this is made into a device port
-;
-; [Element ...]                          # For each element that we shall control
-; required = ignore | switch | volume | enumeration | any     # If set, require this element to be of this kind and available,
-;                                                             # otherwise don't consider this path valid for the card
-; required-absent = ignore | switch | volume                  # If set, require this element to not be of this kind and not
-;                                                             # available, otherwise don't consider this path valid for the card
-;
-; switch = ignore | mute | off | on | select                  # What to do with this switch: ignore it, make it follow mute status,
-;                                                             # always set it to off, always to on, or make it selectable as port.
-;                                                             # If set to 'select' you need to define an Option section for on
-;                                                             # and off
-; volume = ignore | merge | off | zero   # What to do with this volume: ignore it, merge it into the device
-;                                        # volume slider, always set it to the lowest value possible, or always
-;                                        # set it to 0 dB (for whatever that means)
-; enumeration = ignore | select          # What to do with this enumeration, ignore it or make it selectable
-;                                        # via device ports. If set to 'select' you need to define an Option section
-;                                        # for each of the items you want to expose
-; direction = playback | capture         # Is this relevant only for playback or capture? If not set this will implicitly be
-;                                        # set the direction of the PCM device is opened as. Generally this doesn't need to be set
-;                                        # unless you have a broken driver that has playback controls marked for capture or vice
-;                                        # versa
-; direction-try-other = no | yes         # If the element does not supported what is requested, try the other direction, too?
-;
-; override-map.1 = ...                   # Override the channel mask of the mixer control if the control only exposes a single channel
-; override-map.2 = ...                   # Override the channel masks of the mixer control if the control only exposes two channels
-;                                        # Override maps should list for each element channel which high-level channels it controls via a
-;                                        # channel mask. A channel mask may either be the name of a single channel, or the words "all-left",
-;                                        # "all-right", "all-center", "all-front", "all-rear", and "all" to encode a specific subset of
-;                                        # channels in a mask
-
-[Element PCM]
-switch = ignore
-volume = ignore
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element External Amplifier]
-switch = select
-
-[Option External Amplifier:on]
-name = output-amplifier-on
-priority = 10
-
-[Option External Amplifier:off]
-name = output-amplifier-off
-priority = 0
-
-;;; 'Analog Output'
-
-[Element Analog Output]
-enumeration = select
-
-[Option Analog Output:Speakers]
-name = output-speaker
-priority = 10
-
-[Option Analog Output:Headphones]
-name = output-headphones
-priority = 9
-
-[Option Analog Output:FP Headphones]
-name = output-headphones
-priority = 8
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf
deleted file mode 100644
index 9838138..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf
+++ /dev/null
@@ -1,144 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Default profile definitions for the ALSA backend of PulseAudio. This
-; is used as fallback for all cards that have no special mapping
-; assigned. (and should be good enough for the vast majority of
-; cards).  Use the udev property PULSE_PROFILE_SET to assign a
-; different profile set than this one to a device.  So what is this
-; about? Simply, what we do here is map ALSA devices to how they are
-; exposed in PA. We say which ALSA device string to use to open a
-; device, which channel mapping to use then, and which mixer path to
-; use. This is encoded in a 'mapping'. Multiple of these mappings can
-; be bound together in a 'profile' which is then directly exposed in
-; the UI as a card profile. Each mapping assigned to a profile will
-; result in one sink/source to be created if the profile is selected
-; for the card.
-
-; [General]
-; auto-profiles = no | yes                  # Instead of defining all profiles manually, autogenerate
-;                                           # them by combining every input mapping with every output mapping.
-;
-; [Mapping id]
-; device-strings = ...                      # ALSA device string. %f will be replaced by the card identifier.
-; channel-map = ...                         # Channel mapping to use for this device
-; description = ...
-; paths-input = ...                         # A list of mixer paths to use. Every path in this list will be probed.
-;                                           # If multiple are found to be working they will be available as device ports
-; paths-output = ...
-; element-input = ...                       # Instead of configuring a full mixer path simply configure a single
-;                                           # mixer element for volume/mute handling
-; element-output = ...
-; priority = ...
-; direction = any | input | output          # Only useful for?
-;
-; [Profile id]
-; input-mappings = ...                      # Lists mappings for sources on this profile, those mapping must be
-;                                           # defined in this file too
-; output-mappings = ...                     # Lists mappings for sinks on this profile, those mappings must be
-;                                           # defined in this file too
-; description = ...
-; priority = ...                            # Numeric value to deduce priority for this profile
-; skip-probe = no | yes                     # Skip probing for availability? If this is yes then this profile
-;                                           # will be assumed as working without probing. Makes initialization
-;                                           # a bit faster but only works if the card is really known well.
-
-[General]
-auto-profiles = yes
-
-[Mapping analog-mono]
-device-strings = hw:0
-channel-map = mono
-paths-output = analog-output analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
-paths-input = analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
-priority = 1
-
-[Mapping analog-stereo]
-device-strings = front:%f hw:0
-channel-map = left,right
-paths-output = analog-output analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
-paths-input = analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
-priority = 10
-
-[Mapping analog-surround-40]
-device-strings = surround40:%f
-channel-map = front-left,front-right,rear-left,rear-right
-paths-output = analog-output analog-output-speaker analog-output-lfe-on-mono
-priority = 7
-direction = output
-
-[Mapping analog-surround-41]
-device-strings = surround41:%f
-channel-map = front-left,front-right,rear-left,rear-right,lfe
-paths-output = analog-output analog-output-speaker analog-output-lfe-on-mono
-priority = 8
-direction = output
-
-[Mapping analog-surround-50]
-device-strings = surround50:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center
-paths-output = analog-output analog-output-speaker analog-output-lfe-on-mono
-priority = 7
-direction = output
-
-[Mapping analog-surround-51]
-device-strings = surround51:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-paths-output = analog-output analog-output-speaker analog-output-lfe-on-mono
-priority = 8
-direction = output
-
-[Mapping analog-surround-71]
-device-strings = surround71:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-description = Analog Surround 7.1
-paths-output = analog-output analog-output-speaker analog-output-lfe-on-mono
-priority = 7
-direction = output
-
-[Mapping iec958-stereo]
-device-strings = iec958:%f
-channel-map = left,right
-priority = 5
-
-[Mapping iec958-surround-40]
-device-strings = iec958:%f
-channel-map = front-left,front-right,rear-left,rear-right
-priority = 1
-
-[Mapping iec958-ac3-surround-40]
-device-strings = a52:%f
-channel-map = front-left,front-right,rear-left,rear-right
-priority = 2
-direction = output
-
-[Mapping iec958-ac3-surround-51]
-device-strings = a52:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 3
-direction = output
-
-[Mapping hdmi-stereo]
-device-strings = hdmi:%f
-channel-map = left,right
-priority = 4
-direction = output
-
-; An example for defining multiple-sink profiles
-#[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo]
-#description = Foobar
-#output-mappings = analog-stereo iec958-stereo
-#input-mappings = analog-stereo
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf
deleted file mode 100644
index 2b83530..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf
+++ /dev/null
@@ -1,91 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Native Instruments Audio 4 DJ
-;
-; This card has two stereo pairs of input and two stereo pairs of
-; output, named channels A and B. Channel B has an additional
-; Headphone connector.
-;
-; We knowingly only define a subset of the theoretically possible
-; mapping combinations as profiles here.
-;
-; See default.conf for an explanation on the directives used here.
-
-[General]
-auto-profiles = no
-
-[Mapping analog-stereo-a]
-description = Analog Stereo Channel A
-device-strings = hw:%f,0,0
-channel-map = left,right
-
-[Mapping analog-stereo-b-output]
-description = Analog Stereo Channel B (Headphones)
-device-strings = hw:%f,0,1
-channel-map = left,right
-direction = output
-
-[Mapping analog-stereo-b-input]
-description = Analog Stereo Channel B
-device-strings = hw:%f,0,1
-channel-map = left,right
-direction = input
-
-[Profile output:analog-stereo-all+input:analog-stereo-all]
-description = Analog Stereo Duplex Channels A, B (Headphones)
-output-mappings = analog-stereo-a analog-stereo-b-output
-input-mappings = analog-stereo-a analog-stereo-b-input
-priority = 100
-skip-probe = yes
-
-[Profile output:analog-stereo-a+input:analog-stereo-a]
-description = Analog Stereo Duplex Channel A
-output-mappings = analog-stereo-a
-input-mappings = analog-stereo-a
-priority = 40
-skip-probe = yes
-
-[Profile output:analog-stereo-b+input:analog-stereo-b]
-description = Analog Stereo Duplex Channel B (Headphones)
-output-mappings = analog-stereo-b-output
-input-mappings = analog-stereo-b-input
-priority = 50
-skip-probe = yes
-
-[Profile output:analog-stereo-a]
-description = Analog Stereo Output Channel A
-output-mappings = analog-stereo-a
-priority = 5
-skip-probe = yes
-
-[Profile output:analog-stereo-b]
-description = Analog Stereo Output Channel B (Headphones)
-output-mappings = analog-stereo-b-output
-priority = 6
-skip-probe = yes
-
-[Profile input:analog-stereo-a]
-description = Analog Stereo Input Channel A
-input-mappings = analog-stereo-a
-priority = 2
-skip-probe = yes
-
-[Profile input:analog-stereo-b]
-description = Analog Stereo Input Channel B
-input-mappings = analog-stereo-b-input
-priority = 1
-skip-probe = yes
diff --git a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf b/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf
deleted file mode 100644
index 3fe3cc5..0000000
--- a/mmfw-sysconf-simulator.wearable/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf
+++ /dev/null
@@ -1,162 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Native Instruments Audio 8 DJ
-;
-; This card has four stereo pairs of input and four stereo pairs of
-; output, named channels A to D. Channel C has an additional Mic/Line
-; connector, channel D an additional Headphone connector.
-;
-; We knowingly only define a subset of the theoretically possible
-; mapping combinations as profiles here.
-;
-; See default.conf for an explanation on the directives used here.
-
-[General]
-auto-profiles = no
-
-[Mapping analog-stereo-a]
-description = Analog Stereo Channel A
-device-strings = hw:%f,0,0
-channel-map = left,right
-
-[Mapping analog-stereo-b]
-description = Analog Stereo Channel B
-device-strings = hw:%f,0,1
-channel-map = left,right
-
-# Since we want to set a different description for channel C's/D's input
-# and output we define two seperate mappings for them
-[Mapping analog-stereo-c-output]
-description = Analog Stereo Channel C
-device-strings = hw:%f,0,2
-channel-map = left,right
-direction = output
-
-[Mapping analog-stereo-c-input]
-description = Analog Stereo Channel C (Line/Mic)
-device-strings = hw:%f,0,2
-channel-map = left,right
-direction = input
-
-[Mapping analog-stereo-d-output]
-description = Analog Stereo Channel D (Headphones)
-device-strings = hw:%f,0,3
-channel-map = left,right
-direction = output
-
-[Mapping analog-stereo-d-input]
-description = Analog Stereo Channel D
-device-strings = hw:%f,0,3
-channel-map = left,right
-direction = input
-
-[Profile output:analog-stereo-all+input:analog-stereo-all]
-description = Analog Stereo Duplex Channels A, B, C (Line/Mic), D (Headphones)
-output-mappings = analog-stereo-a analog-stereo-b analog-stereo-c-output analog-stereo-d-output
-input-mappings = analog-stereo-a analog-stereo-b analog-stereo-c-input analog-stereo-d-input
-priority = 100
-skip-probe = yes
-
-[Profile output:analog-stereo-d+input:analog-stereo-c]
-description = Analog Stereo Channel D (Headphones) Output, Channel C (Line/Mic) Input
-output-mappings = analog-stereo-d-output
-input-mappings = analog-stereo-c-input
-priority = 90
-skip-probe = yes
-
-[Profile output:analog-stereo-c-d+input:analog-stereo-c-d]
-description = Analog Stereo Duplex Channels C (Line/Mic), D (Line/Mic)
-output-mappings = analog-stereo-c-output analog-stereo-d-output
-input-mappings = analog-stereo-c-input analog-stereo-d-input
-priority = 80
-skip-probe = yes
-
-[Profile output:analog-stereo-a+input:analog-stereo-a]
-description = Analog Stereo Duplex Channel A
-output-mappings = analog-stereo-a
-input-mappings = analog-stereo-a
-priority = 50
-skip-probe = yes
-
-[Profile output:analog-stereo-b+input:analog-stereo-b]
-description = Analog Stereo Duplex Channel B
-output-mappings = analog-stereo-b
-input-mappings = analog-stereo-b
-priority = 40
-skip-probe = yes
-
-[Profile output:analog-stereo-c+input:analog-stereo-c]
-description = Analog Stereo Duplex Channel C (Line/Mic)
-output-mappings = analog-stereo-c-output
-input-mappings = analog-stereo-c-input
-priority = 60
-skip-probe = yes
-
-[Profile output:analog-stereo-d+input:analog-stereo-d]
-description = Analog Stereo Duplex Channel D (Headphones)
-output-mappings = analog-stereo-d-output
-input-mappings = analog-stereo-d-input
-priority = 70
-skip-probe = yes
-
-[Profile output:analog-stereo-a]
-description = Analog Stereo Output Channel A
-output-mappings = analog-stereo-a
-priority = 6
-skip-probe = yes
-
-[Profile output:analog-stereo-b]
-description = Analog Stereo Output Channel B
-output-mappings = analog-stereo-b
-priority = 5
-skip-probe = yes
-
-[Profile output:analog-stereo-c]
-description = Analog Stereo Output Channel C
-output-mappings = analog-stereo-c-output
-priority = 7
-skip-probe = yes
-
-[Profile output:analog-stereo-d]
-description = Analog Stereo Output Channel D (Headphones)
-output-mappings = analog-stereo-d-output
-priority = 8
-skip-probe = yes
-
-[Profile input:analog-stereo-a]
-description = Analog Stereo Input Channel A
-input-mappings = analog-stereo-a
-priority = 2
-skip-probe = yes
-
-[Profile input:analog-stereo-b]
-description = Analog Stereo Input Channel B
-input-mappings = analog-stereo-b
-priority = 1
-skip-probe = yes
-
-[Profile input:analog-stereo-c]
-description = Analog Stereo Input Channel C (Line/Mic)
-input-mappings = analog-stereo-c-input
-priority = 4
-skip-probe = yes
-
-[Profile input:analog-stereo-d]
-description = Analog Stereo Input Channel D
-input-mappings = analog-stereo-d-input
-priority = 3
-skip-probe = yes
diff --git a/mmfw-sysconf-simulator.mobile/etc/asound.conf b/mmfw-sysconf-simulator/etc/asound.conf
index 5b99392..5b99392 100644
--- a/mmfw-sysconf-simulator.mobile/etc/asound.conf
+++ b/mmfw-sysconf-simulator/etc/asound.conf
diff --git a/mmfw-sysconf-simulator.mobile/etc/pulse/client.conf b/mmfw-sysconf-simulator/etc/pulse/client.conf
index 8e0de79..8e0de79 100644
--- a/mmfw-sysconf-simulator.mobile/etc/pulse/client.conf
+++ b/mmfw-sysconf-simulator/etc/pulse/client.conf
diff --git a/mmfw-sysconf-simulator.mobile/etc/pulse/daemon.conf b/mmfw-sysconf-simulator/etc/pulse/daemon.conf
index a50e55a..506fe7d 100644
--- a/mmfw-sysconf-simulator.mobile/etc/pulse/daemon.conf
+++ b/mmfw-sysconf-simulator/etc/pulse/daemon.conf
@@ -50,7 +50,7 @@ log-target = dlog-color
 ; log-time = no
 ; log-backtrace = 0
 
-resample-method = ffmpeg
+resample-method = speex-fixed-3
 ; enable-remixing = yes
 ; enable-lfe-remixing = no
 
diff --git a/mmfw-sysconf-simulator.mobile/etc/pulse/default.pa b/mmfw-sysconf-simulator/etc/pulse/default.pa
index f4807e1..f4807e1 100644
--- a/mmfw-sysconf-simulator.mobile/etc/pulse/default.pa
+++ b/mmfw-sysconf-simulator/etc/pulse/default.pa
diff --git a/mmfw-sysconf-simulator.mobile/etc/pulse/system.pa b/mmfw-sysconf-simulator/etc/pulse/system.pa
index 3d8a925..aedede5 100644
--- a/mmfw-sysconf-simulator.mobile/etc/pulse/system.pa
+++ b/mmfw-sysconf-simulator/etc/pulse/system.pa
@@ -19,14 +19,26 @@
 # This startup script is used only if PulseAudio is started in system
 # mode.
 
+### Custom policy module to route between bt<=speaker
+load-module module-policy
+
+### Stream Manager module
+load-module module-stream-mgr ipc_type=pipe
+load-module module-role-ducking global=1 volume=0
+
+### Currently do not use module-udev-detect, because there is some problem.
+### 	STATIC DEVICE LOAD
+#load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,3
+#load-module module-alsa-source source_name=alsa_input.0.analog-stereo device=hw:0,0
+###	AUTOMATIC DEVICE LOAD
 ### Automatically load driver modules depending on the hardware available
-.ifexists module-hal-detect.so
-#load-module module-hal-detect
-.else
-### Alternatively use the static hardware detection module (for systems that
-### lack HAL support)
+#.ifexists module-udev-detect.so
+#load-module module-udev-detect
+#.else
+### Use the static hardware detection module (for systems that lack udev/hal support)
 load-module module-detect
-.endif
+#.endif
+
 
 ### Load several protocols
 .ifexists module-esound-protocol-unix.so
@@ -36,8 +48,7 @@ load-module module-native-protocol-unix
 
 load-module module-bluetooth-discover
 
-### Custom policy module to route between bt<=speaker
-load-module module-policy
+
 
 ### Automatically restore the volume of streams and devices
 #load-module module-stream-restore
@@ -46,6 +57,11 @@ load-module module-policy
 ### Automatically restore the default sink/source when changed by the user during runtime
 load-module module-default-device-restore
 
+.ifexists module-dbus-protocol.so
+### If you want to allow TCP connections, set access to "remote" or "local,remote".
+load-module module-dbus-protocol access=local
+.endif
+
 ### Automatically move streams to the default sink if the sink they are
 ### connected to dies, similar for sources
 load-module module-rescue-streams
@@ -62,5 +78,8 @@ load-module module-suspend-on-idle
 ### Set default source (not to use alsa_sink monitor which is index 0)
 set-default-source alsa_input.0.analog-stereo
 
+load-module module-null-sink
+load-module module-null-source
+
 load-module module-remap-sink sink_name=mono_alsa master=alsa_output.0.analog-stereo channels=1
 load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
diff --git a/mmfw-sysconf-simulator.mobile/usr/etc/gst-openmax.conf b/mmfw-sysconf-simulator/usr/etc/gst-openmax.conf
index 9c0203c..9c0203c 100644
--- a/mmfw-sysconf-simulator.mobile/usr/etc/gst-openmax.conf
+++ b/mmfw-sysconf-simulator/usr/etc/gst-openmax.conf
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_audio_pcm_dump.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_audio_pcm_dump.ini
new file mode 100644
index 0000000..54e2d2e
--- /dev/null
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_audio_pcm_dump.ini
@@ -0,0 +1,12 @@
+
+[pcm_dump]
+
+# playback
+
+pa_sink                        = n
+pa_sink_input                  = n
+
+# capture
+
+pa_source                      = n
+pa_source_output               = n
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_audio_volume.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_audio_volume.ini
new file mode 100755
index 0000000..a660d1d
--- /dev/null
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_audio_volume.ini
@@ -0,0 +1,61 @@
+
+[speaker]
+system                         = 0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 82, 84, 86, 88, 90
+notification                   = 0, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 95
+alarm                          = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+ringtone                       = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+media                          = 0, 44, 48, 52, 56, 61, 66, 70, 74, 78, 82, 85, 88, 91, 94, 97
+call                           = 60, 65, 70, 76, 82, 88, 94, 100
+voip                           = 60, 65, 70, 76, 82, 88, 94, 100
+voice                          = 0, 55, 58, 61, 64, 67, 70, 73, 76, 79, 82, 85, 88, 91, 94, 97
+gain_dialer                    = 1.00
+gain_touch                     = 1.00
+gain_af                        = 0.70
+gain_shutter1                  = 0.14
+gain_shutter2                  = 1.00
+gain_camcording                = 0.30
+gain_midi                      = 1.00
+gain_booting                   = 0.40
+gain_video                     = 0.90
+gain_tts                       = 1.00
+
+[headset]
+system                         = 0, 54, 56, 58, 60, 62, 64, 67, 70, 73, 76, 79, 82, 85, 88, 91
+notification                   = 0, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 95
+alarm                          = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+ringtone                       = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+media                          = 0, 44, 48, 52, 56, 61, 66, 70, 74, 78, 82, 85, 88, 91, 94, 97
+call                           = 60, 65, 70, 76, 82, 88, 94, 100
+voip                           = 60, 65, 70, 76, 82, 88, 94, 100
+voice                          = 0, 55, 58, 61, 64, 67, 70, 73, 76, 79, 82, 85, 88, 91, 94, 97
+gain_dialer                    = 0.50
+gain_touch                     = 0.60
+gain_af                        = 1.00
+gain_shutter1                  = 1.00
+gain_shutter2                  = 0.80
+gain_camcording                = 0.80
+gain_midi                      = 0.40
+gain_booting                   = 0.60
+gain_video                     = 1.00
+gain_tts                       = 1.00
+
+[btheadset]
+system                         = 0, 55, 58, 61, 63, 66, 69, 72, 75, 78, 81, 84, 87, 90, 93, 96
+notification                   = 0, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 95
+alarm                          = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+ringtone                       = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+media                          = 0, 50, 54, 58, 62, 66, 70, 74, 78, 81, 84, 88, 91, 95, 97, 100
+call                           = 60, 64, 70, 76, 82, 88, 94, 100
+voip                           = 60, 64, 70, 76, 82, 88, 94, 100
+voice                          = 0, 55, 58, 61, 64, 67, 70, 73, 76, 79, 82, 85, 88, 91, 94, 100
+gain_dialer                    = 0.70
+gain_touch                     = 0.70
+gain_af                        = 1.00
+gain_shutter1                  = 1.00
+gain_shutter2                  = 1.00
+gain_camcording                = 1.00
+gain_midi                      = 1.00
+gain_booting                   = 0.70
+gain_video                     = 1.00
+gain_tts                       = 1.00
+
diff --git a/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
index e6a8af8..e169e4f 100644
--- a/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
@@ -36,15 +36,19 @@ UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
 DeviceCount = 2
+SupportMediaPacketPreviewCb = 0
 
 [AudioInput]
-AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,2
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | slave-method,3
 AudiomodemsrcElement = audiotestsrc | 2,0 | do-timestamp,1 | is-live,1
 
 [VideoOutput]
 ; DisplayDevice
 ;;; 0: MAIN LCD, 1: SUB LCD, 2:TV OUT, 3: MAIN LCD and SUB LCD, 4: MAIN LCD and TV OUT
 DisplayDevice = 0 || 0
+; DisplayMode
+;;; 0: Default, 1: Pri Video ON and Sec Video Full-Screen, 2: Pri Video OFF and Sec Video Full-Screen
+DisplayMode = 0 || 0
 ; Videosink
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface
 Videosink = 0,1,3 || 0
@@ -57,11 +61,10 @@ VideoscaleElement = videoscale | 1,0 | method,1
 [VideoEncoder]
 H263 = maru_h263penc | 0,0
 MPEG4 = maru_mpeg4enc | 0,0
-THEORA = theoraenc | 1,0 | num-bufs,4
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
-AAC = ffenc_aac | 0,0
+AAC = maru_aacenc | 0,0
 WAVE = wavenc | 0,0
 VORBIS = vorbisenc | 0,0
 
@@ -81,7 +84,7 @@ UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 1
 VideoAutoAudioResample = 0
-VideoAutoColorSpace = 0
+VideoAutoColorSpace = 1
 AudioProfile = 1
 AudioAutoAudioConvert = 1
 AudioAutoAudioResample = 0
diff --git a/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
index 9d3ab10..b5568bf 100644
--- a/mmfw-sysconf-simulator.wearable/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -25,6 +25,7 @@ InputIndex = 0,-255 || 0
 DeviceName = virtual driver
 PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+VideoResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 FPS = 30 || 30
 ; PictureForamt - MSL value
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
@@ -76,11 +77,9 @@ WhiteBalance = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 ;;; 21:SOLARIZATION_4, 22:SKETCH_1, 23:SKETCH_2, 24:SKETCH_3, 25:SKETCH_4
 ColorTone = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 
-; Flip - real setting value
-;;; 0:NONE, 1:VERTICAL, 2:HORIZONTAL
 ; Flip - MSL value(convert array index)
-;;; 0:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 0
 
 ; Wide Dynamic Range - real setting value
 ;;; N/A
@@ -112,7 +111,7 @@ WDR = 0,-255,-255 || 0
 ;;; N/A
 ; Focus mode - MSL value(convert array index)
 ;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = -255,0,-255,-255,-255,-255 || 0
+FocusMode = 0,-255,-255,-255,-255,-255 || 0
 
 ; Auto focus type - real setting value
 ;;; N/A
@@ -168,7 +167,7 @@ FaceZoomLevel = 0,0 || 0
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
 OutputMode = 4,7,8,13 || 13
 JpegQuality = 0,100 || 50
-MultishotNumber = 1,255 || 1
+MultishotNumber = 1,1 || 1
 SensorEncodedCapture = 0
 ; Support HDR
 ;;; 0: OFF, 1: ON, 2: ON and Original
@@ -177,6 +176,7 @@ SupportHDR = 0,-255,-255 || 0
 
 [Detect]
 ; Detect mode
+;;; No need to convert
 ;;; 0:OFF, 1:ON
 DetectMode = 0,-255 || 0
 ;DetectNumber - Not support
diff --git a/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
index c4e49c4..86994c9 100644
--- a/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -25,6 +25,7 @@ InputIndex = -255,0 || 0
 DeviceName = virtual driver
 PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+VideoResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 FPS = 30 || 30
 ; PictureForamt - MSL value
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
@@ -76,11 +77,9 @@ WhiteBalance = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 ;;; 21:SOLARIZATION_4, 22:SKETCH_1, 23:SKETCH_2, 24:SKETCH_3, 25:SKETCH_4
 ColorTone = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 
-; Flip - real setting value
-;;; 0:NONE, 1:VERTICAL, 2:HORIZONTAL
 ; Flip - MSL value(convert array index)
-;;; 0:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 0
 
 ; Wide Dynamic Range - real setting value
 ;;; N/A
@@ -112,7 +111,7 @@ WDR = 0,-255,-255 || 0
 ;;; N/A
 ; Focus mode - MSL value(convert array index)
 ;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = -255,0,-255,-255,-255,-255 || 0
+FocusMode = 0,-255,-255,-255,-255,-255 || 0
 
 ; Auto focus type - real setting value
 ;;; N/A
@@ -168,7 +167,7 @@ FaceZoomLevel = 0,0 || 0
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
 OutputMode = 4,7,8,13 || 13
 JpegQuality = 0,100 || 50
-MultishotNumber = 1,255 || 1
+MultishotNumber = 1,1 || 1
 SensorEncodedCapture = 0
 ; Support HDR
 ;;; 0: OFF, 1: ON, 2: ON and Original
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
new file mode 100644
index 0000000..13fdc13
--- /dev/null
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
@@ -0,0 +1,96 @@
+[general]
+
+; if disabled typefind element will used directely
+use decodebin = no ; async state change problem exist
+
+use sink handler = yes
+
+disable segtrap = yes ; same effect with --gst-disable-segtrap
+
+; set default videosink element according to video surface type(X, EVAS, NULL)
+videosink element x = xvimagesink
+videosink element evas = evaspixmapsink
+videosink element fake = fakesink
+
+video converter element = ffmpegcolorspace
+
+audiosink element = pulsesink
+
+drmsrc element = filesrc
+
+; if yes. gstreamer will not update registry
+skip rescan = yes
+delay before repeat = 50 ; msec
+
+; comma separated list of tocken which elemnts has it in it's name will not be used
+element exclude keyword = omx_
+
+async start = yes
+
+multiple codec supported = yes
+
+; parameters for initializing gstreamer
+gstparam1 =
+gstparam2 =
+gstparam3 =
+gstparam4 =
+gstparam5 =
+
+; generating dot file representing pipeline state
+generate dot = no
+
+; parameter for clock provide in audiosink
+provide clock = yes
+
+; allowed timeout for changing pipeline state
+live state change timeout = 30 ; sec
+localplayback state change timeout = 10 ; sec
+
+; delay in msec for sending EOS
+eos delay = 150 ; msec
+
+
+[http streaming]
+
+httpsrc element = souphttpsrc
+
+; if set, use file or not use memory for buffering
+http file buffer path = /opt/usr/media
+
+http buffering limit = 99.0 ; percent
+
+http max size bytes = 1048576 ; bytes
+
+http buffering time = 1.2
+
+http timeout = 30 ; sec
+
+
+[rtsp streaming]
+
+rtspsrc element = rtspsrc
+
+rtsp buffering time = 5000; msec
+
+rtsp rebuffering time = 15000; msec
+
+rtsp do typefinding = no; if no, caps on rtspsrc:src pad will be used for autoplugging
+
+rtsp error concealment = yes
+
+
+[hw accelation]
+use video hw accel = no
+
+
+[priority]
+
+use priority setting = no
+
+demux = 95
+
+videosink = 96
+
+audiosink = 97
+
+ringbuffer = 98
diff --git a/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_player_audio_effect.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_player_audio_effect.ini
index 1394608..1394608 100644
--- a/mmfw-sysconf-simulator.mobile/usr/etc/mmfw_player_audio_effect.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_player_audio_effect.ini
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf
index db78eb4..db78eb4 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf
index baf674a..baf674a 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf
index 4be5722..4be5722 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf
index f7f3085..f7f3085 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf
index 2a36f2f..2a36f2f 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf.common b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf.common
index b35e7af..b35e7af 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf.common
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf.common
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-tvtuner.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-tvtuner.conf
index 8531ec7..8531ec7 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-tvtuner.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-tvtuner.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-video.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-video.conf
index 74c76f0..74c76f0 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input-video.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input-video.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf
index 5055f90..5055f90 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf.common b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf.common
index 951e11f..951e11f 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf.common
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-input.conf.common
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf
index f2fd31c..f2fd31c 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf
index 2131cfe..2131cfe 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output-lfe-on-mono.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output-lfe-on-mono.conf
index 0a43e27..0a43e27 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output-lfe-on-mono.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output-lfe-on-mono.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf
index 542edc4..542edc4 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf
index aea7853..aea7853 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf
index fc30800..fc30800 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common
index 90c2bb0..90c2bb0 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf
index 9838138..9838138 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf
index 2b83530..2b83530 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf
diff --git a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf
index 3fe3cc5..3fe3cc5 100644
--- a/mmfw-sysconf-simulator.mobile/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf
diff --git a/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/tizen_usb.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/tizen_usb.conf
new file mode 100644
index 0000000..31bc6a6
--- /dev/null
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/tizen_usb.conf
@@ -0,0 +1,120 @@
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+; Default profile definitions for the ALSA backend of PulseAudio. This
+; is used as fallback for all cards that have no special mapping
+; assigned (and should be good enough for the vast majority of
+; cards). If you want to assign a different profile set than this one
+; to a device, either set the udev property PULSE_PROFILE_SET for the
+; card, or use the "profile_set" module argument when loading
+; module-alsa-card.
+;
+; So what is this about? Simply, what we do here is map ALSA devices
+; to how they are exposed in PA. We say which ALSA device string to
+; use to open a device, which channel mapping to use then, and which
+; mixer path to use. This is encoded in a 'mapping'. Multiple of these
+; mappings can be bound together in a 'profile' which is then directly
+; exposed in the UI as a card profile. Each mapping assigned to a
+; profile will result in one sink/source to be created if the profile
+; is selected for the card.
+;
+; Additionally, the path set configuration files can describe the
+; decibel values assigned to the steps of the volume elements. This
+; can be used to work around situations when the alsa driver doesn't
+; provide any decibel information, or when the information is
+; incorrect.
+
+
+; [General]
+; auto-profiles = no | yes                  # Instead of defining all profiles manually, autogenerate
+;                                           # them by combining every input mapping with every output mapping.
+;
+; [Mapping id]
+; device-strings = ...                      # ALSA device string. %f will be replaced by the card identifier.
+; channel-map = ...                         # Channel mapping to use for this device
+; description = ...
+; paths-input = ...                         # A list of mixer paths to use. Every path in this list will be probed.
+;                                           # If multiple are found to be working they will be available as device ports
+; paths-output = ...
+; element-input = ...                       # Instead of configuring a full mixer path simply configure a single
+;                                           # mixer element for volume/mute handling
+; element-output = ...
+; priority = ...
+; direction = any | input | output          # Only useful for?
+;
+; [Profile id]
+; input-mappings = ...                      # Lists mappings for sources on this profile, those mapping must be
+;                                           # defined in this file too
+; output-mappings = ...                     # Lists mappings for sinks on this profile, those mappings must be
+;                                           # defined in this file too
+; description = ...
+; priority = ...                            # Numeric value to deduce priority for this profile
+; skip-probe = no | yes                     # Skip probing for availability? If this is yes then this profile
+;                                           # will be assumed as working without probing. Makes initialization
+;                                           # a bit faster but only works if the card is really known well.
+;
+; [DecibelFix element]                      # Decibel fixes can be used to work around missing or incorrect dB
+;                                           # information from alsa. A decibel fix is a table that maps volume steps
+;                                           # to decibel values for one volume element. The "element" part in the
+;                                           # section title is the name of the volume element.
+;                                           #
+;                                           # NOTE: This feature is meant just as a help for figuring out the correct
+;                                           # decibel values. PulseAudio is not the correct place to maintain the
+;                                           # decibel mappings!
+;                                           #
+;                                           # If you need this feature, then you should make sure that when you have
+;                                           # the correct values figured out, the alsa driver developers get informed
+;                                           # too, so that they can fix the driver.
+;
+; db-values = ...                           # The option value consists of pairs of step numbers and decibel values.
+;                                           # The pairs are separated with whitespace, and steps are separated from
+;                                           # the corresponding decibel values with a colon. The values must be in an
+;                                           # increasing order. Here's an example of a valid string:
+;                                           #
+;                                           #     "0:-40.50  1:-38.70  3:-33.00  11:0"
+;                                           #
+;                                           # The lowest step imposes a lower limit for hardware volume and the
+;                                           # highest step correspondingly imposes a higher limit. That means that
+;                                           # that the mixer will never be set outside those values - the rest of the
+;                                           # volume scale is done using software volume.
+;                                           #
+;                                           # As can be seen in the example, you don't need to specify a dB value for
+;                                           # each step. The dB values for skipped steps will be linearly interpolated
+;                                           # using the nearest steps that are given.
+
+[General]
+auto-profiles = yes
+
+[Mapping usb-analog-stereo]
+device-strings = hw:%f
+channel-map = left,right
+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
+priority = 10
+direction = output
+
+[Mapping usb-analog-surround-51]
+device-strings = hw:%f
+;channel-map = front-left,front-right,front-center,lfe,rear-left,rear-right
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
+priority = 180
+direction = output
+
+; An example for defining multiple-sink profiles
+#[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo]
+#description = Foobar
+#output-mappings = analog-stereo iec958-stereo
+#input-mappings = analog-stereo
diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 9b394d8..1b13bcb 100755..100644
--- a/packaging/mmfw-sysconf.spec
+++ b/packaging/mmfw-sysconf.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf
 Summary:    Multimedia Framework system configuration package
-Version:    0.1.207
+Version:    0.1.220
 Release:    0
 VCS:        framework/multimedia/mmfw-sysconf#mmfw-sysconf_0.1.110-0-144-g25720f9f7daad9a897662eb6059d71d958cc3f06
 Group:      TO_BE/FILLED_IN
@@ -67,11 +67,7 @@ mkdir -p %{buildroot}/mmfw-sysconf-e3250
 cp -arf mmfw-sysconf-e3250/* %{buildroot}/mmfw-sysconf-e3250
 %else
 mkdir -p %{buildroot}/mmfw-sysconf-simulator
-%if 0%{?tizen_profile_wearable}
-cp -arf mmfw-sysconf-simulator.wearable/* %{buildroot}/mmfw-sysconf-simulator
-%else
-cp -arf mmfw-sysconf-simulator.mobile/* %{buildroot}/mmfw-sysconf-simulator
-%endif
+cp -arf mmfw-sysconf-simulator/* %{buildroot}/mmfw-sysconf-simulator
 %endif
 
 %ifarch %{arm}
@@ -125,7 +121,6 @@ rm -rf /mmfw-sysconf-simulator
 /mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/*.conf
 /mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/*.common
 /mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/*.conf
-/mmfw-sysconf-simulator/opt/system/*
 /usr/share/license/mmfw-sysconf-simulator
 %endif