utils/libsiren/common.c utils/libsiren/common.h utils/libsiren/dct4.c utils/libsiren/dct4.h utils/libsiren/decoder.c utils/libsiren/decoder.h utils/libsiren/encoder.c utils/libsiren/encoder.h utils/libsiren/huffman.c utils/libsiren/huffman.h utils/libsiren/huffman_consts.h utils/libsiren/rmlt.c utils/libsiren/rmlt.h utils/libsiren/siren7.h utils/siren7_decoder.c utils/siren7_decoder.h @@ -13,6 +13,9 @@ Original patch to add support for handwritten messages (read-only): * Chris Stafford * Gal Topper +Original patch to add support for voice clips (receive-only): + * Chris Stafford + Translators: * Marco de Moulin <marco@point.nl> (Dutch) * Simo Mattila <simo.h.mattila@gmail.com> (Finnish) AUTHORS @@ -43,7 +43,7 @@ override CFLAGS += -DPECAN_DEBUG_SLP # For glib < 2.6 support (libpurple maniacs) FALLBACK_CFLAGS := -I./fix_purple -LDFLAGS := -Wl,--no-undefined +LDFLAGS := -Wl,--no-undefined,-lm prefix := $(DESTDIR)/$(PURPLE_PREFIX) plugin_dir := $(prefix)/lib/purple-2 @@ -88,6 +88,13 @@ ifdef CVR cvr/slpmsg.o \ cvr/slpsession.o \ cvr/pecan_slp_object.o + + objects += utils/libsiren/common.o \ + utils/libsiren/dct4.o \ + utils/libsiren/decoder.o \ + utils/libsiren/huffman.o \ + utils/libsiren/rmlt.o \ + utils/siren7_decoder.o endif ifdef SOCKET Makefile @@ -11,6 +11,7 @@ Compared to Pidgin's official MSN plug-in: * Experimental direct connection support (fast file transfers) * Server-side storage for display names (private alias) * Support for handwritten messages (read-only) + * Support for voice clips (receive-only) Other features: README @@ -65,6 +65,7 @@ typedef enum MSN_CLIENT_CAP_WEBMSGR = 0x00100, MSN_CLIENT_CAP_DIRECTIM = 0x04000, MSN_CLIENT_CAP_WINKS = 0x08000, + MSN_CLIENT_CAP_VOICE_CLIP = 0x40000, MSN_CLIENT_CAP_SEARCH = 0x10000 } MsnClientCaps; @@ -84,7 +85,7 @@ typedef enum #define MSN_CLIENT_ID_RESERVED_1 0x00 #define MSN_CLIENT_ID_RESERVED_2 0x00 #if defined(PECAN_CVR) -#define MSN_CLIENT_ID_CAPABILITIES MSN_CLIENT_CAP_BASE | MSN_CLIENT_CAP_INK_GIF +#define MSN_CLIENT_ID_CAPABILITIES MSN_CLIENT_CAP_BASE | MSN_CLIENT_CAP_INK_GIF | MSN_CLIENT_CAP_VOICE_CLIP #else #define MSN_CLIENT_ID_CAPABILITIES MSN_CLIENT_CAP_BASE #endif /* defined(PECAN_CVR) */ msn.h @@ -28,6 +28,7 @@ #if defined(PECAN_CVR) #include "cvr/slplink.h" +#include "utils/siren7_decoder.h" #endif /* defined(PECAN_CVR) */ #include "session_private.h" @@ -1180,6 +1181,76 @@ control_msg(MsnCmdProc *cmdproc, MsnMessage *msg) } } +#if defined(PECAN_CVR) +static void +got_datacast_inform_user (MsnCmdProc *cmdproc, + const char *passport, + char *str) +{ + PurpleAccount *account; + MsnSwitchBoard *swboard; + PecanContact *contact; + const char *friendly_name; + + account = cmdproc->session->account; + swboard = cmdproc->data; + contact = pecan_contactlist_find_contact(cmdproc->session->contactlist, passport); + friendly_name = pecan_contact_get_friendly_name(contact); + if (!friendly_name) + friendly_name = passport; + + str = g_strdup_printf("%s %s", friendly_name, str); + + /* Grab the conv for this swboard. If there isn't one and it's an IM then create it, + otherwise the smileys won't work, this needs to be fixed. */ + if (!swboard->conv) + { + if (swboard->current_users > 1) + swboard->conv = purple_find_chat(account->gc, swboard->chat_id); + else + { + swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, + passport, account); + if (!swboard->conv) + swboard->conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, passport); + } + } + swboard->flag |= MSN_SB_FLAG_IM; + + purple_conversation_write(swboard->conv, NULL, str, PURPLE_MESSAGE_SYSTEM, time(NULL)); +} + +static void +got_voice_clip(MsnSlpCall *slpcall, const guchar *data, gsize size) +{ + FILE *f; + char *file, *str; + + if ((f = purple_mkstemp(&file, TRUE))) + { + char *decoded_file = malloc(sizeof(file)+13); + + fwrite(data, size, 1, f); + fclose(f); + + strcpy(decoded_file, file); + strcat(decoded_file, "_decoded.wav"); + + decode_wav_using_siren7 (file, decoded_file); + + str = g_strdup_printf("sent you a voice clip. Click <a href='file://%s'>here</a> to play it.", decoded_file); + got_datacast_inform_user(slpcall->slplink->swboard->cmdproc, slpcall->slplink->remote_user, str); + + g_free(str); + } else { + pecan_error ("couldn't create temporany file to store the received voice clip!\n"); + + str = g_strdup_printf("sent you a voice clip, but it cannot be played due to an error happened while storing the file."); + got_datacast_inform_user(slpcall->slplink->swboard->cmdproc, slpcall->slplink->remote_user, str); + } +} +#endif /* defined(PECAN_CVR) */ + static void datacast_msg (MsnCmdProc *cmdproc, MsnMessage *msg) @@ -1204,7 +1275,19 @@ datacast_msg (MsnCmdProc *cmdproc, } else if (strcmp (id, "3") == 0) { - /* voice clips */ +#if defined(PECAN_CVR) + const char *data; + MsnSlpLink *slplink; + MsnObject *obj; + + data = g_hash_table_lookup(body, "Data"); + obj = msn_object_new_from_string(data); + slplink = msn_session_get_slplink(cmdproc->session, passport); + + msn_slplink_request_object(slplink, data, got_voice_clip, NULL, obj); + + msn_object_destroy(obj); +#endif /* defined(PECAN_CVR) */ } else { switchboard.c 8abc7cf84ee11e840d142ceb56ee1181d94ee6d3 Devid Antonio Filoni devidfil@gmail.com http://github.com/felipec/msn-pecan/commit/b7b5c75e375a0ba74df6f7bd0c4546a01263ec68 b7b5c75e375a0ba74df6f7bd0c4546a01263ec68 2009-01-17T08:40:03-08:00 2009-01-03T14:23:24-08:00 Add support for receiving voice clips. Thanks to Chris Stafford and Youness Alaoui for this. 2f40aa63777c429c060e1aed226f948abd8609cb Felipe Contreras felipe.contreras@gmail.com