Update mused.conf

Change-Id: Ibeff0e2de1c05b18946db5104d0aaeb2d5afe867

diff --git a/mmfw-sysconf-simulator/etc/multimedia/mused.conf b/mmfw-sysconf-simulator/etc/multimedia/mused.conf
index 4c91450046d10a09667b87b2a359ad532bcd6921..0ac3657f31d98926794efb368cf9bb743be2d1b7 100644 (file)
--- a/mmfw-sysconf-simulator/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-simulator/etc/multimedia/mused.conf
@@ -1,8 +1,13 @@
 [muse]
 ; The 'hosts' parameter defines the modules,
 ; which the user would like to connect to the muse.
-hosts=player, camera, recorder, sound
-logfile=/var/log/muse.log
+; If you want to add host, then write manually.
+hosts=player, camera, recorder
+logfile=/var/log/mused/muse-server
+lockfile=/tmp/.muse_core.lock
+muse_server_ready=/tmp/.muse_server_ready
+min_timeout=5
+max_timeout=90
 
 ; parameters for initializing gstreamer
 ; DEFAULT SET (--gst-debug=*:2)
@@ -22,12 +27,14 @@ gstparam10=
 ; This module recovers the "capi-media-player".
 path=libmuse-player.so
 preloaded=no
+timeout=60
 
 [camera]
 ; The 'camera' parameter represents the muse-camera.
 ; This module recovers the "capi-media-camera".
 path=libmuse-camera.so
 preloaded=no
+timeout=10
 
 [recorder]
 ; The 'recorder' parameter represents the muse-recorder.
@@ -35,7 +42,4 @@ preloaded=no
 ; This one should be paired with the 'camera' module.
 path=libmuse-recorder.so
 preloaded=no
-
-[sound]
-path=libmuse-sound.so
-preloaded=no
+timeout=10

diff --git a/mmfw-sysconf-target-artik10/etc/multimedia/mused.conf b/mmfw-sysconf-target-artik10/etc/multimedia/mused.conf
index 4c91450046d10a09667b87b2a359ad532bcd6921..0ac3657f31d98926794efb368cf9bb743be2d1b7 100644 (file)
--- a/mmfw-sysconf-target-artik10/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-artik10/etc/multimedia/mused.conf
@@ -1,8 +1,13 @@
 [muse]
 ; The 'hosts' parameter defines the modules,
 ; which the user would like to connect to the muse.
-hosts=player, camera, recorder, sound
-logfile=/var/log/muse.log
+; If you want to add host, then write manually.
+hosts=player, camera, recorder
+logfile=/var/log/mused/muse-server
+lockfile=/tmp/.muse_core.lock
+muse_server_ready=/tmp/.muse_server_ready
+min_timeout=5
+max_timeout=90
 
 ; parameters for initializing gstreamer
 ; DEFAULT SET (--gst-debug=*:2)
@@ -22,12 +27,14 @@ gstparam10=
 ; This module recovers the "capi-media-player".
 path=libmuse-player.so
 preloaded=no
+timeout=60
 
 [camera]
 ; The 'camera' parameter represents the muse-camera.
 ; This module recovers the "capi-media-camera".
 path=libmuse-camera.so
 preloaded=no
+timeout=10
 
 [recorder]
 ; The 'recorder' parameter represents the muse-recorder.
@@ -35,7 +42,4 @@ preloaded=no
 ; This one should be paired with the 'camera' module.
 path=libmuse-recorder.so
 preloaded=no
-
-[sound]
-path=libmuse-sound.so
-preloaded=no
+timeout=10

diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mused.conf b/mmfw-sysconf-target-hawkp/etc/multimedia/mused.conf
index 4c91450046d10a09667b87b2a359ad532bcd6921..0ac3657f31d98926794efb368cf9bb743be2d1b7 100644 (file)
--- a/mmfw-sysconf-target-hawkp/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-hawkp/etc/multimedia/mused.conf
@@ -1,8 +1,13 @@
 [muse]
 ; The 'hosts' parameter defines the modules,
 ; which the user would like to connect to the muse.
-hosts=player, camera, recorder, sound
-logfile=/var/log/muse.log
+; If you want to add host, then write manually.
+hosts=player, camera, recorder
+logfile=/var/log/mused/muse-server
+lockfile=/tmp/.muse_core.lock
+muse_server_ready=/tmp/.muse_server_ready
+min_timeout=5
+max_timeout=90
 
 ; parameters for initializing gstreamer
 ; DEFAULT SET (--gst-debug=*:2)
@@ -22,12 +27,14 @@ gstparam10=
 ; This module recovers the "capi-media-player".
 path=libmuse-player.so
 preloaded=no
+timeout=60
 
 [camera]
 ; The 'camera' parameter represents the muse-camera.
 ; This module recovers the "capi-media-camera".
 path=libmuse-camera.so
 preloaded=no
+timeout=10
 
 [recorder]
 ; The 'recorder' parameter represents the muse-recorder.
@@ -35,7 +42,4 @@ preloaded=no
 ; This one should be paired with the 'camera' module.
 path=libmuse-recorder.so
 preloaded=no
-
-[sound]
-path=libmuse-sound.so
-preloaded=no
+timeout=10

diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mused.conf b/mmfw-sysconf-target-n4/etc/multimedia/mused.conf
index 4c91450046d10a09667b87b2a359ad532bcd6921..0ac3657f31d98926794efb368cf9bb743be2d1b7 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-n4/etc/multimedia/mused.conf
@@ -1,8 +1,13 @@
 [muse]
 ; The 'hosts' parameter defines the modules,
 ; which the user would like to connect to the muse.
-hosts=player, camera, recorder, sound
-logfile=/var/log/muse.log
+; If you want to add host, then write manually.
+hosts=player, camera, recorder
+logfile=/var/log/mused/muse-server
+lockfile=/tmp/.muse_core.lock
+muse_server_ready=/tmp/.muse_server_ready
+min_timeout=5
+max_timeout=90
 
 ; parameters for initializing gstreamer
 ; DEFAULT SET (--gst-debug=*:2)
@@ -22,12 +27,14 @@ gstparam10=
 ; This module recovers the "capi-media-player".
 path=libmuse-player.so
 preloaded=no
+timeout=60
 
 [camera]
 ; The 'camera' parameter represents the muse-camera.
 ; This module recovers the "capi-media-camera".
 path=libmuse-camera.so
 preloaded=no
+timeout=10
 
 [recorder]
 ; The 'recorder' parameter represents the muse-recorder.
@@ -35,7 +42,4 @@ preloaded=no
 ; This one should be paired with the 'camera' module.
 path=libmuse-recorder.so
 preloaded=no
-
-[sound]
-path=libmuse-sound.so
-preloaded=no
+timeout=10

diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mused.conf b/mmfw-sysconf-target-tm1/etc/multimedia/mused.conf
index 4c91450046d10a09667b87b2a359ad532bcd6921..0ac3657f31d98926794efb368cf9bb743be2d1b7 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-tm1/etc/multimedia/mused.conf
@@ -1,8 +1,13 @@
 [muse]
 ; The 'hosts' parameter defines the modules,
 ; which the user would like to connect to the muse.
-hosts=player, camera, recorder, sound
-logfile=/var/log/muse.log
+; If you want to add host, then write manually.
+hosts=player, camera, recorder
+logfile=/var/log/mused/muse-server
+lockfile=/tmp/.muse_core.lock
+muse_server_ready=/tmp/.muse_server_ready
+min_timeout=5
+max_timeout=90
 
 ; parameters for initializing gstreamer
 ; DEFAULT SET (--gst-debug=*:2)
@@ -22,12 +27,14 @@ gstparam10=
 ; This module recovers the "capi-media-player".
 path=libmuse-player.so
 preloaded=no
+timeout=60
 
 [camera]
 ; The 'camera' parameter represents the muse-camera.
 ; This module recovers the "capi-media-camera".
 path=libmuse-camera.so
 preloaded=no
+timeout=10
 
 [recorder]
 ; The 'recorder' parameter represents the muse-recorder.
@@ -35,7 +42,4 @@ preloaded=no
 ; This one should be paired with the 'camera' module.
 path=libmuse-recorder.so
 preloaded=no
-
-[sound]
-path=libmuse-sound.so
-preloaded=no
+timeout=10

diff --git a/mmfw-sysconf-target-tw1/etc/multimedia/mused.conf b/mmfw-sysconf-target-tw1/etc/multimedia/mused.conf
index 4c91450046d10a09667b87b2a359ad532bcd6921..0ac3657f31d98926794efb368cf9bb743be2d1b7 100644 (file)
--- a/mmfw-sysconf-target-tw1/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-tw1/etc/multimedia/mused.conf
@@ -1,8 +1,13 @@
 [muse]
 ; The 'hosts' parameter defines the modules,
 ; which the user would like to connect to the muse.
-hosts=player, camera, recorder, sound
-logfile=/var/log/muse.log
+; If you want to add host, then write manually.
+hosts=player, camera, recorder
+logfile=/var/log/mused/muse-server
+lockfile=/tmp/.muse_core.lock
+muse_server_ready=/tmp/.muse_server_ready
+min_timeout=5
+max_timeout=90
 
 ; parameters for initializing gstreamer
 ; DEFAULT SET (--gst-debug=*:2)
@@ -22,12 +27,14 @@ gstparam10=
 ; This module recovers the "capi-media-player".
 path=libmuse-player.so
 preloaded=no
+timeout=60
 
 [camera]
 ; The 'camera' parameter represents the muse-camera.
 ; This module recovers the "capi-media-camera".
 path=libmuse-camera.so
 preloaded=no
+timeout=10
 
 [recorder]
 ; The 'recorder' parameter represents the muse-recorder.
@@ -35,7 +42,4 @@ preloaded=no
 ; This one should be paired with the 'camera' module.
 path=libmuse-recorder.so
 preloaded=no
-
-[sound]
-path=libmuse-sound.so
-preloaded=no
+timeout=10

diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mused.conf b/mmfw-sysconf-target-u3/etc/multimedia/mused.conf
index 4c91450046d10a09667b87b2a359ad532bcd6921..0ac3657f31d98926794efb368cf9bb743be2d1b7 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/multimedia/mused.conf
+++ b/mmfw-sysconf-target-u3/etc/multimedia/mused.conf
@@ -1,8 +1,13 @@
 [muse]
 ; The 'hosts' parameter defines the modules,
 ; which the user would like to connect to the muse.
-hosts=player, camera, recorder, sound
-logfile=/var/log/muse.log
+; If you want to add host, then write manually.
+hosts=player, camera, recorder
+logfile=/var/log/mused/muse-server
+lockfile=/tmp/.muse_core.lock
+muse_server_ready=/tmp/.muse_server_ready
+min_timeout=5
+max_timeout=90
 
 ; parameters for initializing gstreamer
 ; DEFAULT SET (--gst-debug=*:2)
@@ -22,12 +27,14 @@ gstparam10=
 ; This module recovers the "capi-media-player".
 path=libmuse-player.so
 preloaded=no
+timeout=60
 
 [camera]
 ; The 'camera' parameter represents the muse-camera.
 ; This module recovers the "capi-media-camera".
 path=libmuse-camera.so
 preloaded=no
+timeout=10
 
 [recorder]
 ; The 'recorder' parameter represents the muse-recorder.
@@ -35,7 +42,4 @@ preloaded=no
 ; This one should be paired with the 'camera' module.
 path=libmuse-recorder.so
 preloaded=no
-
-[sound]
-path=libmuse-sound.so
-preloaded=no
+timeout=10

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 6123cb470a777e8a4c9522984dd629519356e358..3a84bda1ff2bdb2b07f3e296e73b73b77a370a30 100644 (file)
--- 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.2.95
+Version:    0.2.96
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1+ and Apache-2.0