| @@ -1,912 +0,0 @@
---- amarok/configure.in.in
-+++ amarok/configure.in.in
-@@ -352,7 +352,7 @@ if test "$build_yauap" != "no"; then
- # check for dbus-glib
- have_yauap=no
-
-- PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1,
-+ PKG_CHECK_MODULES(DBUS, dbus-1,
- have_yauap=yes,have_yauap=no)
-
-
-@@ -361,10 +361,8 @@ if test "$build_yauap" != "no"; then
- LIB_YAUAP=""
- CFLAGS_YAUAP=""
- else
-- PKG_CHECK_MODULES(GOBJECT, gobject-2.0,
-- have_yauap=yes,have_yauap=no)
-- LIB_YAUAP="$DBUSGLIB_LIBS -ldbus-qt-1 $GOBJECT_LIBS"
-- CFLAGS_YAUAP="$DBUSGLIB_CFLAGS $GOBJECT_CFLAGS"
-+ LIB_YAUAP="$DBUS_LIBS -ldbus-qt-1"
-+ CFLAGS_YAUAP="$DBUS_CFLAGS"
- AC_SUBST(LIB_YAUAP)
- AC_SUBST(CFLAGS_YAUAP)
- AC_DEFINE(HAVE_YAUAP, 1, [have yauap])
---- amarok/src/engine/yauap/yauap-engine.cpp
-+++ amarok/src/engine/yauap/yauap-engine.cpp
-@@ -16,13 +16,6 @@ copyright : (C) 2006 by Sasch
-
- #include <qprocess.h>
-
--/* FIXME use the qt bindings....
-- we can't use the glib signal handling because it requires a g_main loop
-- otherwise the glib bindings might probably be ok because gstreamer is using glib anyway
-- Currently the engine uses the c bindings for signal handling and the glib bindings for function calls
--
--*/
--#include <dbus/dbus-glib.h>
- #include <klocale.h>
- #include <iostream>
- #include <stdlib.h>
-@@ -31,7 +24,9 @@ copyright : (C) 2006 by Sasch
- #include <dbus/connection.h>
-
- //#define MANUAL_YAUAP_START
--#define YAUAP_STARTUP_TIMEOUT 10000
-+#define YAUAP_DBUS_SERVICE "org.yauap.CommandService"
-+#define YAUAP_DBUS_PATH "/yauapObject"
-+#define YAUAP_DBUS_INTERFACE "org.yauap.CommandInterface"
-
- #include "yauap-engine.h"
- #include "debug.h"
-@@ -138,7 +133,7 @@ DBusConnection::close()
- }
-
-
--DBusConnection::DBusConnection( void* c )
-+DBusConnection::DBusConnection( yauapEngine* c )
- {
- qt_connection = NULL;
- dbus_connection = NULL;
-@@ -150,6 +145,89 @@ DBusConnection::~DBusConnection()
- close();
- }
-
-+bool
-+DBusConnection::send(const char *method, int first_arg_type, ...)
-+{
-+ dbus_uint32_t serial = 0;
-+ bool ret = false;
-+
-+ QMutexLocker lock(&m_mutex);
-+
-+ DBusMessage* msg = dbus_message_new_method_call(
-+ YAUAP_DBUS_SERVICE, YAUAP_DBUS_PATH, YAUAP_DBUS_INTERFACE,
-+ method);
-+
-+ if (msg) {
-+ va_list ap;
-+
-+ va_start(ap, first_arg_type);
-+ dbus_message_append_args_valist(msg, first_arg_type, ap);
-+ va_end(ap);
-+
-+ ret = dbus_connection_send(dbus_connection, msg, &serial);
-+ dbus_message_unref (msg);
-+ }
-+
-+ return ret;
-+}
-+
-+int
-+DBusConnection::call(const char *method, int first_arg_type, ...)
-+{
-+ dbus_uint32_t ret = -1;
-+
-+ va_list ap;
-+ va_start (ap, first_arg_type);
-+ DBusMessage* msg = send_with_reply(method, first_arg_type, ap);
-+ va_end (ap);
-+
-+ if (msg) {
-+ DBusMessageIter args;
-+ if (dbus_message_iter_init(msg, &args) && DBUS_TYPE_INT32 ==
-+ dbus_message_iter_get_arg_type(&args))
-+ dbus_message_iter_get_basic(&args, &ret);
-+
-+ dbus_message_unref (msg);
-+ }
-+
-+ return ret;
-+}
-+
-+DBusMessage*
-+DBusConnection::send_with_reply(const char* method, int first_arg_type, ...)
-+{
-+ va_list ap;
-+ va_start(ap, first_arg_type);
-+ DBusMessage* msg = send_with_reply(method, first_arg_type, ap);
-+ va_end(ap);
-+ return msg;
-+}
-+
-+DBusMessage*
-+DBusConnection::send_with_reply(const char* method, int first_arg_type, va_list ap)
-+{
-+ QMutexLocker lock(&m_mutex);
-+
-+ DBusMessage* msg = dbus_message_new_method_call(
-+ YAUAP_DBUS_SERVICE, YAUAP_DBUS_PATH, YAUAP_DBUS_INTERFACE, method);
-+
-+ if (msg) {
-+ dbus_message_append_args_valist(msg, first_arg_type, ap);
-+
-+ DBusPendingCall* pcall = 0;
-+
-+ dbus_connection_send_with_reply(dbus_connection, msg, &pcall, -1);
-+ dbus_message_unref (msg);
-+
-+ dbus_pending_call_block(pcall);
-+ msg = dbus_pending_call_steal_reply(pcall);
-+ dbus_pending_call_unref(pcall);
-+ }
-+
-+ return msg;
-+}
-+
-+
- /* emit state change signal */
- void
- yauapEngine::change_state( Engine::State state )
-@@ -161,74 +239,58 @@ yauapEngine::change_state( Engine::State
- /* destroy engine */
- yauapEngine::~yauapEngine()
- {
-- GError *error = NULL;
- /* make sure we really stopped */
- stop();
-
- /* quit the player */
-- if ( !dbus_g_proxy_call( remote_object, "quit", &error,
-- G_TYPE_INVALID,
-- G_TYPE_INVALID) )
-- {
--
-- debug() << "quit failed " << error->message << endl;
-- g_error_free( error );
-- }
--
-+ if ( !con->send("quit", DBUS_TYPE_INVALID) )
-+ debug() << "quit failed " << endl;
-
-- /* destroy Qt DBus connection */
-- if(con)
-- delete con;
--
-- /* free remote object */
-- if(remote_object)
-- g_object_unref(remote_object);
--
-- /* kill yauap */
--#ifndef MANUAL_YAUAP_START
-- helper.kill();
--#endif
-+ delete con;
- }
-
- /* fetch metadata from yauap */
- void
--yauapEngine::update_metadata(void){
-+yauapEngine::update_metadata()
-+{
- Engine::SimpleMetaBundle bndl;
-- GError *error = NULL;
-- char **reply_list;
-- char **reply_ptr;
- debug() << " emit metadata change " << endl;
-
-+ DBusMessage* msg = con->send_with_reply("get_metadata", DBUS_TYPE_INVALID);
-+ if (msg) {
|
