From 2a6deaf6c4b61d9624277076be4ec06bf94ef88d Mon Sep 17 00:00:00 2001 From: shatty Date: Mon, 16 Sep 2002 05:17:06 +0000 Subject: [PATCH] Fixed allocation problem. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1054 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../AbstractFileInterfaceNode.cpp | 29 ++++++++----------- .../media-add-ons/AbstractFileInterfaceNode.h | 2 +- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/add-ons/media/media-add-ons/AbstractFileInterfaceNode.cpp b/src/add-ons/media/media-add-ons/AbstractFileInterfaceNode.cpp index 7bf6006e7d..3fca352a07 100644 --- a/src/add-ons/media/media-add-ons/AbstractFileInterfaceNode.cpp +++ b/src/add-ons/media/media-add-ons/AbstractFileInterfaceNode.cpp @@ -819,25 +819,20 @@ status_t AbstractFileInterfaceNode::HandleParameter( // public: -flavor_info * AbstractFileInterfaceNode::GetFlavor(int32 id) +void AbstractFileInterfaceNode::GetFlavor(flavor_info * info, int32 id) { fprintf(stderr,"AbstractFileInterfaceNode::GetFlavor\n"); - static bool initialized = false; - static flavor_info info; - if (initialized == false) { - info.name = "AbstractFileInterfaceNode"; - info.info = "A AbstractFileInterfaceNode node handles a file."; - info.kinds = B_FILE_INTERFACE | B_CONTROLLABLE; - info.flavor_flags = B_FLAVOR_IS_LOCAL; - info.possible_count = INT_MAX; - info.in_format_count = 0; // no inputs - info.in_formats = 0; - info.out_format_count = 0; // no outputs - info.out_formats = 0; - info.internal_id = id; - initialized = true; - } - return &info; + info->name = "AbstractFileInterfaceNode"; + info->info = "A AbstractFileInterfaceNode node handles a file."; + info->kinds = B_FILE_INTERFACE | B_CONTROLLABLE; + info->flavor_flags = B_FLAVOR_IS_LOCAL; + info->possible_count = INT_MAX; + info->in_format_count = 0; // no inputs + info->in_formats = 0; + info->out_format_count = 0; // no outputs + info->out_formats = 0; + info->internal_id = id; + return; } media_format * AbstractFileInterfaceNode::GetFormat() diff --git a/src/add-ons/media/media-add-ons/AbstractFileInterfaceNode.h b/src/add-ons/media/media-add-ons/AbstractFileInterfaceNode.h index b0a0d01272..070ab3f0f2 100644 --- a/src/add-ons/media/media-add-ons/AbstractFileInterfaceNode.h +++ b/src/add-ons/media/media-add-ons/AbstractFileInterfaceNode.h @@ -260,7 +260,7 @@ virtual status_t HandleParameter( public: -static flavor_info * GetFlavor(int32 id); +static void GetFlavor(flavor_info * info, int32 id); static media_format * GetFormat(); static media_file_format * GetFileFormat();