Navigation

Changeset 3942

Timestamp:

03/05/10 13:23:16 (5 months ago)

Author:

nedko

Message:

merge: Return error over dbus when server start, stop or switchmaster fails

Merge branch 'jackdbus_control_failure_fix'

Files:

r3843	r3942
88	88	if (!jack_controller_start_server(controller_ptr, call))
89	89	{
90		jack_error ("Failed to start server");
91		}
92		else
93		{
94		jack_controller_control_send_signal_server_started();
95		}
	90	jack_dbus_error(call, JACK_DBUS_ERROR_GENERIC, "Failed to start server");
	91	return true;
	92	}
	93
	94	jack_controller_control_send_signal_server_started();
96	95	}
97	96	else if (strcmp (call->method_name, "StopServer") == 0)
…	…
99	98	if (!jack_controller_stop_server(controller_ptr, call))
100	99	{
101		jack_error ("Failed to stop server");
102		}
103		else
104		{
105		jack_controller_control_send_signal_server_stopped();
106		}
	100	jack_dbus_error(call, JACK_DBUS_ERROR_GENERIC, "Failed to stop server");
	101	return true;
	102	}
	103
	104	jack_controller_control_send_signal_server_stopped();
107	105	}
108	106	else if (strcmp (call->method_name, "SwitchMaster") == 0)
…	…
110	108	if (!jack_controller_switch_master(controller_ptr, call))
111	109	{
112		jack_error ("Failed to switch master");
113		}
114		else
115		{
116		jack_controller_control_send_signal_server_stopped();
117		}
	110	jack_dbus_error(call, JACK_DBUS_ERROR_GENERIC, "Failed to switch master");
	111	return true;
	112	}
	113
	114	jack_controller_control_send_signal_server_stopped();
118	115	}
119	116	else if (strcmp (call->method_name, "GetLoad") == 0)