From 8f2969b5fd7ba7c18d3b5762508e70ea1a39a13e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 19 May 2013 11:51:28 -0400 Subject: Rename EMailParserAudioInline to EMailParserAudio. --- modules/audio-inline/Makefile.am | 4 +- modules/audio-inline/e-mail-parser-audio-inline.c | 166 --------------------- modules/audio-inline/e-mail-parser-audio-inline.h | 30 ---- modules/audio-inline/e-mail-parser-audio.c | 166 +++++++++++++++++++++ modules/audio-inline/e-mail-parser-audio.h | 30 ++++ .../audio-inline/evolution-module-audio-inline.c | 4 +- 6 files changed, 200 insertions(+), 200 deletions(-) delete mode 100644 modules/audio-inline/e-mail-parser-audio-inline.c delete mode 100644 modules/audio-inline/e-mail-parser-audio-inline.h create mode 100644 modules/audio-inline/e-mail-parser-audio.c create mode 100644 modules/audio-inline/e-mail-parser-audio.h (limited to 'modules/audio-inline') diff --git a/modules/audio-inline/Makefile.am b/modules/audio-inline/Makefile.am index 9da77d0d15..49d8ab10f0 100644 --- a/modules/audio-inline/Makefile.am +++ b/modules/audio-inline/Makefile.am @@ -13,8 +13,8 @@ module_audio_inline_la_CPPFLAGS = \ module_audio_inline_la_SOURCES = \ e-mail-formatter-audio-inline.c \ e-mail-formatter-audio-inline.h \ - e-mail-parser-audio-inline.c \ - e-mail-parser-audio-inline.h \ + e-mail-parser-audio.c \ + e-mail-parser-audio.h \ e-mail-part-audio.h \ evolution-module-audio-inline.c diff --git a/modules/audio-inline/e-mail-parser-audio-inline.c b/modules/audio-inline/e-mail-parser-audio-inline.c deleted file mode 100644 index 54d6a98f43..0000000000 --- a/modules/audio-inline/e-mail-parser-audio-inline.c +++ /dev/null @@ -1,166 +0,0 @@ -/* - * e-mail-parser-audio-inline.c - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include - -#include "e-mail-parser-audio-inline.h" -#include "e-mail-part-audio.h" - -#include - -#include -#include -#include - -#include - -#define d(x) - -typedef EMailParserExtension EMailParserAudioInline; -typedef EMailParserExtensionClass EMailParserAudioInlineClass; - -typedef EExtension EMailParserAudioInlineLoader; -typedef EExtensionClass EMailParserAudioInlineLoaderClass; - -GType e_mail_parser_audio_inline_get_type (void); - -G_DEFINE_DYNAMIC_TYPE ( - EMailParserAudioInline, - e_mail_parser_audio_inline, - E_TYPE_MAIL_PARSER_EXTENSION) - -static const gchar *parser_mime_types[] = { - "audio/ac3", - "audio/x-ac3", - "audio/basic", - "audio/mpeg", - "audio/x-mpeg", - "audio/mpeg3", - "audio/x-mpeg3", - "audio/mp3", - "audio/x-mp3", - "audio/mp4", - "audio/flac", - "audio/x-flac", - "audio/mod", - "audio/x-mod", - "audio/x-wav", - "audio/microsoft-wav", - "audio/x-wma", - "audio/x-ms-wma", - "application/ogg", - "application/x-ogg", - NULL -}; - -static void -mail_part_audio_inline_free (EMailPart *mail_part) -{ - EMailPartAudio *ai_part = (EMailPartAudio *) mail_part; - - g_clear_object (&ai_part->play_button); - g_clear_object (&ai_part->pause_button); - g_clear_object (&ai_part->stop_button); - - if (ai_part->filename) { - g_unlink (ai_part->filename); - g_free (ai_part->filename); - ai_part->filename = NULL; - } - - if (ai_part->bus_id) { - g_source_remove (ai_part->bus_id); - ai_part->bus_id = 0; - } - - if (ai_part->playbin) { - gst_element_set_state (ai_part->playbin, GST_STATE_NULL); - gst_object_unref (ai_part->playbin); - ai_part->playbin = NULL; - } -} - -static gint -empe_audio_inline_parse (EMailParserExtension *extension, - EMailParser *parser, - CamelMimePart *part, - GString *part_id, - GCancellable *cancellable, - GQueue *out_mail_queue) -{ - EMailPartAudio *mail_part; - GQueue work_queue = G_QUEUE_INIT; - gint len; - gint n_parts_added = 0; - - len = part_id->len; - g_string_append (part_id, ".org-gnome-audio-inline-button-panel"); - - d (printf ("audio inline formatter: format classid %s\n", part_id->str)); - - mail_part = (EMailPartAudio *) e_mail_part_subclass_new ( - part, part_id->str, sizeof (EMailPartAudio), - (GFreeFunc) mail_part_audio_inline_free); - mail_part->parent.mime_type = camel_content_type_simple ( - camel_mime_part_get_content_type (part)); - mail_part->parent.is_attachment = TRUE; - g_string_truncate (part_id, len); - - g_queue_push_tail (&work_queue, mail_part); - n_parts_added++; - - e_mail_parser_wrap_as_attachment ( - parser, part, part_id, &work_queue); - - e_queue_transfer (&work_queue, out_mail_queue); - - return TRUE; -} - -static void -e_mail_parser_audio_inline_class_init (EMailParserExtensionClass *class) -{ - class->mime_types = parser_mime_types; - class->flags = E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION; - class->parse = empe_audio_inline_parse; -} - -static void -e_mail_parser_audio_inline_class_finalize (EMailParserExtensionClass *class) -{ - -} - -static void -e_mail_parser_audio_inline_init (EMailParserExtension *extension) -{ -} - -void -e_mail_parser_audio_inline_type_register (GTypeModule *type_module) -{ - e_mail_parser_audio_inline_register_type (type_module); -} - diff --git a/modules/audio-inline/e-mail-parser-audio-inline.h b/modules/audio-inline/e-mail-parser-audio-inline.h deleted file mode 100644 index 8c80becb20..0000000000 --- a/modules/audio-inline/e-mail-parser-audio-inline.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * e-mail-parser-audio-inline.h - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - */ - -#ifndef E_MAIL_PARSER_AUDIO_INLINE_H -#define E_MAIL_PARSER_AUDIO_INLINE_H - -#include - -G_BEGIN_DECLS - -void e_mail_parser_audio_inline_type_register (GTypeModule *type_module); - -G_END_DECLS - -#endif /* E_MAIL_PARSER_AUDIO_INLINE_H */ diff --git a/modules/audio-inline/e-mail-parser-audio.c b/modules/audio-inline/e-mail-parser-audio.c new file mode 100644 index 0000000000..c81a94bcff --- /dev/null +++ b/modules/audio-inline/e-mail-parser-audio.c @@ -0,0 +1,166 @@ +/* + * e-mail-parser-audio.c + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include + +#include "e-mail-parser-audio.h" +#include "e-mail-part-audio.h" + +#include + +#include +#include +#include + +#include + +#define d(x) + +typedef EMailParserExtension EMailParserAudio; +typedef EMailParserExtensionClass EMailParserAudioClass; + +typedef EExtension EMailParserAudioLoader; +typedef EExtensionClass EMailParserAudioLoaderClass; + +GType e_mail_parser_audio_get_type (void); + +G_DEFINE_DYNAMIC_TYPE ( + EMailParserAudio, + e_mail_parser_audio, + E_TYPE_MAIL_PARSER_EXTENSION) + +static const gchar *parser_mime_types[] = { + "audio/ac3", + "audio/x-ac3", + "audio/basic", + "audio/mpeg", + "audio/x-mpeg", + "audio/mpeg3", + "audio/x-mpeg3", + "audio/mp3", + "audio/x-mp3", + "audio/mp4", + "audio/flac", + "audio/x-flac", + "audio/mod", + "audio/x-mod", + "audio/x-wav", + "audio/microsoft-wav", + "audio/x-wma", + "audio/x-ms-wma", + "application/ogg", + "application/x-ogg", + NULL +}; + +static void +mail_part_audio_free (EMailPart *mail_part) +{ + EMailPartAudio *ai_part = (EMailPartAudio *) mail_part; + + g_clear_object (&ai_part->play_button); + g_clear_object (&ai_part->pause_button); + g_clear_object (&ai_part->stop_button); + + if (ai_part->filename) { + g_unlink (ai_part->filename); + g_free (ai_part->filename); + ai_part->filename = NULL; + } + + if (ai_part->bus_id) { + g_source_remove (ai_part->bus_id); + ai_part->bus_id = 0; + } + + if (ai_part->playbin) { + gst_element_set_state (ai_part->playbin, GST_STATE_NULL); + gst_object_unref (ai_part->playbin); + ai_part->playbin = NULL; + } +} + +static gint +mail_parser_audio_parse (EMailParserExtension *extension, + EMailParser *parser, + CamelMimePart *part, + GString *part_id, + GCancellable *cancellable, + GQueue *out_mail_queue) +{ + EMailPartAudio *mail_part; + GQueue work_queue = G_QUEUE_INIT; + gint len; + gint n_parts_added = 0; + + len = part_id->len; + g_string_append (part_id, ".org-gnome-audio-button-panel"); + + d (printf ("audio formatter: format classid %s\n", part_id->str)); + + mail_part = (EMailPartAudio *) e_mail_part_subclass_new ( + part, part_id->str, sizeof (EMailPartAudio), + (GFreeFunc) mail_part_audio_free); + mail_part->parent.mime_type = camel_content_type_simple ( + camel_mime_part_get_content_type (part)); + mail_part->parent.is_attachment = TRUE; + g_string_truncate (part_id, len); + + g_queue_push_tail (&work_queue, mail_part); + n_parts_added++; + + e_mail_parser_wrap_as_attachment ( + parser, part, part_id, &work_queue); + + e_queue_transfer (&work_queue, out_mail_queue); + + return TRUE; +} + +static void +e_mail_parser_audio_class_init (EMailParserExtensionClass *class) +{ + class->mime_types = parser_mime_types; + class->flags = E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION; + class->parse = mail_parser_audio_parse; +} + +static void +e_mail_parser_audio_class_finalize (EMailParserExtensionClass *class) +{ + +} + +static void +e_mail_parser_audio_init (EMailParserExtension *extension) +{ +} + +void +e_mail_parser_audio_type_register (GTypeModule *type_module) +{ + e_mail_parser_audio_register_type (type_module); +} + diff --git a/modules/audio-inline/e-mail-parser-audio.h b/modules/audio-inline/e-mail-parser-audio.h new file mode 100644 index 0000000000..fa7119c796 --- /dev/null +++ b/modules/audio-inline/e-mail-parser-audio.h @@ -0,0 +1,30 @@ +/* + * e-mail-parser-audio.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + */ + +#ifndef E_MAIL_PARSER_AUDIO_H +#define E_MAIL_PARSER_AUDIO_H + +#include + +G_BEGIN_DECLS + +void e_mail_parser_audio_type_register (GTypeModule *type_module); + +G_END_DECLS + +#endif /* E_MAIL_PARSER_AUDIO_H */ diff --git a/modules/audio-inline/evolution-module-audio-inline.c b/modules/audio-inline/evolution-module-audio-inline.c index 297c5b6ffe..c57f3b286d 100644 --- a/modules/audio-inline/evolution-module-audio-inline.c +++ b/modules/audio-inline/evolution-module-audio-inline.c @@ -17,7 +17,7 @@ */ #include "e-mail-formatter-audio-inline.h" -#include "e-mail-parser-audio-inline.h" +#include "e-mail-parser-audio.h" #include @@ -28,7 +28,7 @@ const gchar * g_module_check_init (GModule *module); G_MODULE_EXPORT void e_module_load (GTypeModule *type_module) { - e_mail_parser_audio_inline_type_register (type_module); + e_mail_parser_audio_type_register (type_module); e_mail_formatter_audio_inline_type_register (type_module); } -- cgit v1.2.3