device-manager-dbus: Change error type

[Version] 11.1.24
[Issue type] Error value

Change-Id: If037f520d67d474927d9f210dd28e350ed98ee84
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index c415c25..361fb39 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          11.1.23
+Version:          11.1.24
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/device-manager-dbus.c b/src/device-manager-dbus.c
index d109fdc..99b7c91 100644 (file)
--- a/src/device-manager-dbus.c
+++ b/src/device-manager-dbus.c
@@ -1013,12 +1013,12 @@ static void handle_get_supported_sample_formats(DBusConnection *conn, DBusMessag
         return;
     }
     if (!is_usb_output_device(device)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.PolicyInternal");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     if (!(sink = pa_tz_device_get_sink(device, DEVICE_ROLE_NORMAL))) {
         pa_log_error("could not get sink for normal role");
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "%s", "org.tizen.multimedia.audio.Internal");
         return;
     }
 
@@ -1063,18 +1063,18 @@ static void handle_set_sample_format(DBusConnection *conn, DBusMessage *msg, voi
         return;
     }
     if (!is_usb_output_device(device)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.PolicyInternal");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     if (!(sink = pa_tz_device_get_sink(device, DEVICE_ROLE_NORMAL))) {
         pa_log_error("could not get sink for normal role");
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "%s", "org.tizen.multimedia.audio.Internal");
         return;
     }
 
     /* use a supported sample format selected by user */
     if (!is_supported_sample_format(sink->supported_sample_formats, pa_parse_sample_format(sample_format))) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     prev_selected_sample_format = sink->selected_sample_format;
@@ -1123,12 +1123,12 @@ static void handle_get_sample_format(DBusConnection *conn, DBusMessage *msg, voi
         return;
     }
     if (!is_usb_output_device(device)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.PolicyInternal");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     if (!(sink = pa_tz_device_get_sink(device, DEVICE_ROLE_NORMAL))) {
         pa_log_error("could not get sink for normal role");
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "%s", "org.tizen.multimedia.audio.Internal");
         return;
     }
 
@@ -1184,12 +1184,12 @@ static void handle_get_supported_sample_rates(DBusConnection *conn, DBusMessage
         return;
     }
     if (!is_usb_output_device(device)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.PolicyInternal");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     if (!(sink = pa_tz_device_get_sink(device, DEVICE_ROLE_NORMAL))) {
         pa_log_error("could not get sink for normal role");
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "%s", "org.tizen.multimedia.audio.Internal");
         return;
     }
 
@@ -1233,18 +1233,18 @@ static void handle_set_sample_rate(DBusConnection *conn, DBusMessage *msg, void
         return;
     }
     if (!is_usb_output_device(device)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.PolicyInternal");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     if (!(sink = pa_tz_device_get_sink(device, DEVICE_ROLE_NORMAL))) {
         pa_log_error("could not get sink for normal role");
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "%s", "org.tizen.multimedia.audio.Internal");
         return;
     }
 
     /* use a supported sample rate selected by user */
     if (!is_supported_sample_rate(sink->supported_sample_rates, sample_rate)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     prev_selected_sample_rate = sink->selected_sample_rate;
@@ -1292,12 +1292,12 @@ static void handle_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void
         return;
     }
     if (!is_usb_output_device(device)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.PolicyInternal");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     if (!(sink = pa_tz_device_get_sink(device, DEVICE_ROLE_NORMAL))) {
         pa_log_error("could not get sink for normal role");
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "%s", "org.tizen.multimedia.audio.Internal");
         return;
     }
 
@@ -1334,11 +1334,11 @@ static void handle_set_specific_stream_only(DBusConnection *conn, DBusMessage *m
         return;
     }
     if (!is_usb_output_device(device)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.PolicyInternal");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     if (!pa_stream_manager_is_valid_stream_role(dm->core, stream_role)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
 
@@ -1375,7 +1375,7 @@ static void handle_get_specified_stream(DBusConnection *conn, DBusMessage *msg,
         return;
     }
     if (!is_usb_output_device(device)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.PolicyInternal");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
 
@@ -1415,12 +1415,12 @@ static void handle_set_avoid_resampling(DBusConnection *conn, DBusMessage *msg,
         return;
     }
     if (!is_usb_output_device(device)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.PolicyInternal");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     if (!(sink = pa_tz_device_get_sink(device, DEVICE_ROLE_NORMAL))) {
         pa_log_error("could not get sink for normal role");
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "%s", "org.tizen.multimedia.audio.Internal");
         return;
     }
     if (sink->avoid_resampling == avoid_resampling) {
@@ -1468,12 +1468,12 @@ static void handle_get_avoid_resampling(DBusConnection *conn, DBusMessage *msg,
         return;
     }
     if (!is_usb_output_device(device)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.PolicyInternal");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_NOT_SUPPORTED, "%s", "org.tizen.multimedia.audio.InvalidOperation");
         return;
     }
     if (!(sink = pa_tz_device_get_sink(device, DEVICE_ROLE_NORMAL))) {
         pa_log_error("could not get sink for normal role");
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", "org.tizen.multimedia.audio.InvalidArgument");
+        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "%s", "org.tizen.multimedia.audio.Internal");
         return;
     }