Author: chris_y Date: Sun Jun 5 18:07:10 2011 New Revision: 12466 URL: http://source.netsurf-browser.org?rev=12466&view=rev Log: Sound DataTypes implementation. Currently has no interface, so only autoplay/autoStart objects will play. Added: trunk/netsurf/amiga/dt_sound.c (with props) Modified: trunk/netsurf/amiga/Makefile.target trunk/netsurf/amiga/datatypes.c trunk/netsurf/amiga/datatypes.h Modified: trunk/netsurf/amiga/Makefile.target URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/Makefile.target?rev... ============================================================================== --- trunk/netsurf/amiga/Makefile.target (original) +++ trunk/netsurf/amiga/Makefile.target Sun Jun 5 18:07:10 2011 @@ -73,7 +73,7 @@ cookies.c context_menu.c clipboard.c save_complete.c \ launch.c search.c history_local.c download.c iff_dr2d.c \ sslcert.c gui_options.c print.c theme.c drag.c icon.c system_colour.c \ - datatypes.c dt_picture.c dt_anim.c plugin_hack.c \ + datatypes.c dt_picture.c dt_anim.c dt_sound.c plugin_hack.c \ stringview/stringview.c stringview/urlhistory.c S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) Modified: trunk/netsurf/amiga/datatypes.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/datatypes.c?rev=124... ============================================================================== --- trunk/netsurf/amiga/datatypes.c (original) +++ trunk/netsurf/amiga/datatypes.c Sun Jun 5 18:07:10 2011 @@ -29,6 +29,9 @@ err = amiga_dt_anim_init(); if(err != NSERROR_OK) return err; + err = amiga_dt_sound_init(); + if(err != NSERROR_OK) return err; + return NSERROR_OK; } @@ -36,5 +39,6 @@ { amiga_dt_picture_fini(); amiga_dt_anim_fini(); + amiga_dt_sound_fini(); } #endif Modified: trunk/netsurf/amiga/datatypes.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/datatypes.h?rev=124... ============================================================================== --- trunk/netsurf/amiga/datatypes.h (original) +++ trunk/netsurf/amiga/datatypes.h Sun Jun 5 18:07:10 2011 @@ -33,6 +33,9 @@ nserror amiga_dt_anim_init(void); void amiga_dt_anim_fini(void); +nserror amiga_dt_sound_init(void); +void amiga_dt_sound_fini(void); + #else #define amiga_datatypes_init() NSERROR_OK Added: trunk/netsurf/amiga/dt_sound.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dt_sound.c?rev=1246... ============================================================================== --- trunk/netsurf/amiga/dt_sound.c (added) +++ trunk/netsurf/amiga/dt_sound.c Sun Jun 5 18:07:10 2011 @@ -1,0 +1,287 @@ +/* + * Copyright 2011 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>;. + */ + +/** \file + * DataTypes sound handler (implementation) +*/ + +#ifdef WITH_AMIGA_DATATYPES +#include "amiga/filetype.h" +#include "amiga/datatypes.h" +#include "content/content_protected.h" +#include "desktop/plotters.h" +#include "render/box.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/talloc.h" + +#include <proto/datatypes.h> +#include <proto/dos.h> +#include <proto/intuition.h> +#include <datatypes/soundclass.h> +#include <intuition/classusr.h> + +typedef struct amiga_dt_sound_content { + struct content base; + + Object *dto; + bool immediate; +} amiga_dt_sound_content; + +static nserror amiga_dt_sound_create(const content_handler *handler, + lwc_string *imime_type, const http_parameter *params, + llcache_handle *llcache, const char *fallback_charset, + bool quirks, struct content **c); +static bool amiga_dt_sound_convert(struct content *c); +static void amiga_dt_sound_destroy(struct content *c); +static bool amiga_dt_sound_redraw(struct content *c, int x, int y, + int width, int height, const struct rect *clip, + float scale, colour background_colour, + bool repeat_x, bool repeat_y); +static void amiga_dt_sound_open(struct content *c, struct browser_window *bw, + struct content *page, struct box *box, + struct object_params *params); +static nserror amiga_dt_sound_clone(const struct content *old, struct content **newc); +static content_type amiga_dt_sound_content_type(lwc_string *mime_type); + +static const content_handler amiga_dt_sound_content_handler = { + .create = amiga_dt_sound_create, + .data_complete = amiga_dt_sound_convert, + .destroy = amiga_dt_sound_destroy, + .redraw = amiga_dt_sound_redraw, + .open = amiga_dt_sound_open, + .clone = amiga_dt_sound_clone, + .type = amiga_dt_sound_content_type, + .no_share = false, +}; + + +void amiga_dt_sound_play(Object *dto) +{ + LOG(("Playing...")); + IDoMethod(dto, DTM_TRIGGER, NULL, STM_PLAY, NULL); +} + + +nserror amiga_dt_sound_init(void) +{ + char dt_mime[50]; + struct DataType *dt, *prevdt = NULL; + lwc_string *type; + lwc_error lerror; + nserror error; + BPTR fh = 0; + struct Node *node = NULL; + + while((dt = ObtainDataType(DTST_RAM, NULL, + DTA_DataType, prevdt, + DTA_GroupID, GID_SOUND, + TAG_DONE)) != NULL) + { + ReleaseDataType(prevdt); + prevdt = dt; + + do { + node = ami_mime_from_datatype(dt, &type, node); + + if(node) + { + error = content_factory_register_handler(type, + &amiga_dt_sound_content_handler); + + if (error != NSERROR_OK) + return error; + } + + }while (node != NULL); + + } + + ReleaseDataType(prevdt); + + return NSERROR_OK; +} + +void amiga_dt_sound_fini(void) +{ + /* Nothing to do */ +} + +nserror amiga_dt_sound_create(const content_handler *handler, + lwc_string *imime_type, const http_parameter *params, + llcache_handle *llcache, const char *fallback_charset, + bool quirks, struct content **c) +{ + amiga_dt_sound_content *plugin; + nserror error; + + LOG(("amiga_dt_sound_create")); + + plugin = talloc_zero(0, amiga_dt_sound_content); + if (plugin == NULL) + return NSERROR_NOMEM; + + error = content__init(&plugin->base, handler, imime_type, params, + llcache, fallback_charset, quirks); + if (error != NSERROR_OK) { + talloc_free(plugin); + return error; + } + + *c = (struct content *) plugin; + + return NSERROR_OK; +} + +bool amiga_dt_sound_convert(struct content *c) +{ + LOG(("amiga_dt_sound_convert")); + + amiga_dt_sound_content *plugin = (amiga_dt_sound_content *) c; + union content_msg_data msg_data; + int width, height; + char title[100]; + const uint8 *data; + ULONG size; + Object *dto; + + data = (uint8 *)content__get_source_data(c, &size); + + plugin->dto = NewDTObject(NULL, + DTA_SourceType, DTST_MEMORY, + DTA_SourceAddress, data, + DTA_SourceSize, size, + DTA_GroupID, GID_SOUND, + TAG_DONE); + + if(plugin->dto == NULL) return false; + + c->width = width; + c->height = height; + + if(plugin->immediate == true) amiga_dt_sound_play(plugin->dto); + + content_set_ready(c); + content_set_done(c); + + content_set_status(c, ""); + return true; +} + +void amiga_dt_sound_destroy(struct content *c) +{ + amiga_dt_sound_content *plugin = (amiga_dt_sound_content *) c; + + LOG(("amiga_dt_sound_destroy")); + + DisposeDTObject(plugin->dto); + + return; +} + +bool amiga_dt_sound_redraw(struct content *c, int x, int y, + int width, int height, const struct rect *clip, + float scale, colour background_colour, + bool repeat_x, bool repeat_y) +{ + plot_style_t pstyle = { + .fill_type = PLOT_OP_TYPE_SOLID, + .fill_colour = 0xffffff, + .stroke_colour = 0x000000, + .stroke_width = 1, + }; + + LOG(("amiga_dt_sound_redraw")); + + /* this should be some sort of play/stop control */ + + plot.rectangle(x, y, x + width, y + height, &pstyle); + return plot.text(x, y+20, lwc_string_data(content__get_mime_type(c)), + lwc_string_length(content__get_mime_type(c)), plot_style_font); + +} + + +void amiga_dt_sound_open(struct content *c, struct browser_window *bw, + struct content *page, struct box *box, + struct object_params *params) +{ + amiga_dt_sound_content *plugin = (amiga_dt_sound_content *) c; + struct object_param *param; + + LOG(("amiga_dt_sound_open")); + + plugin->immediate = false; + + if(params && (param = params->params)) + { + do + { + LOG(("%s = %s", param->name, param->value)); + if((strcmp(param->name, "autoplay") == 0) && + (strcmp(param->value, "true") == 0)) plugin->immediate = true; + if((strcmp(param->name, "autoStart") == 0) && + (strcmp(param->value, "1") == 0)) plugin->immediate = true; + param = param->next; + } while(param != NULL); + } + + if(plugin->dto && (plugin->immediate == true)) + amiga_dt_sound_play(plugin->dto); + + return; +} + + +nserror amiga_dt_sound_clone(const struct content *old, struct content **newc) +{ + amiga_dt_sound_content *plugin; + nserror error; + + LOG(("amiga_dt_sound_clone")); + + plugin = talloc_zero(0, amiga_dt_sound_content); + if (plugin == NULL) + return NSERROR_NOMEM; + + error = content__clone(old, &plugin->base); + if (error != NSERROR_OK) { + content_destroy(&plugin->base); + return error; + } + + /* We "clone" the old content by replaying conversion */ + if (old->status == CONTENT_STATUS_READY || + old->status == CONTENT_STATUS_DONE) { + if (amiga_dt_sound_convert(&plugin->base) == false) { + content_destroy(&plugin->base); + return NSERROR_CLONE_FAILED; + } + } + + *newc = (struct content *) plugin; + + return NSERROR_OK; +} + +content_type amiga_dt_sound_content_type(lwc_string *mime_type) +{ + return CONTENT_PLUGIN; +} + +#endif Propchange: trunk/netsurf/amiga/dt_sound.c ------------------------------------------------------------------------------ amiga:protection = ----rw-d ---- ----