diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-29 07:43:28 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-29 07:56:09 +0300 |
commit | 1b68f71348ecf3983b76b40d7940da8377f049b7 (patch) | |
tree | 2974eddaef130a067c26033d60a59fc790365b3d /indra/media_plugins/base | |
parent | af4ea94efc1999f3b19fd8d643d0331f0b77e265 (diff) |
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
Diffstat (limited to 'indra/media_plugins/base')
-rw-r--r-- | indra/media_plugins/base/media_plugin_base.cpp | 154 | ||||
-rw-r--r-- | indra/media_plugins/base/media_plugin_base.h | 118 |
2 files changed, 136 insertions, 136 deletions
diff --git a/indra/media_plugins/base/media_plugin_base.cpp b/indra/media_plugins/base/media_plugin_base.cpp index 37c498664a..545eee25a9 100644 --- a/indra/media_plugins/base/media_plugin_base.cpp +++ b/indra/media_plugins/base/media_plugin_base.cpp @@ -1,28 +1,28 @@ -/** +/** * @file media_plugin_base.cpp * @brief Media plugin base class for LLMedia API plugin system * - * All plugins should be a subclass of MediaPluginBase. + * All plugins should be a subclass of MediaPluginBase. * * @cond * $LicenseInfo:firstyear=2008&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library 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; * version 2.1 of the License only. - * + * * This library 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 this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ * @endcond @@ -40,102 +40,102 @@ /// @param[in] host_user_data Message data for messages from plugin to plugin loader shell MediaPluginBase::MediaPluginBase( - LLPluginInstance::sendMessageFunction host_send_func, - void *host_user_data ) + LLPluginInstance::sendMessageFunction host_send_func, + void *host_user_data ) { - mHostSendFunction = host_send_func; - mHostUserData = host_user_data; - mDeleteMe = false; - mPixels = 0; - mWidth = 0; - mHeight = 0; - mTextureWidth = 0; - mTextureHeight = 0; - mDepth = 0; - mStatus = STATUS_NONE; + mHostSendFunction = host_send_func; + mHostUserData = host_user_data; + mDeleteMe = false; + mPixels = 0; + mWidth = 0; + mHeight = 0; + mTextureWidth = 0; + mTextureHeight = 0; + mDepth = 0; + mStatus = STATUS_NONE; } /** * Converts current media status enum value into string (STATUS_LOADING into "loading", etc.) - * + * * @return Media status string ("loading", "playing", "paused", etc) * */ std::string MediaPluginBase::statusString() { - std::string result; - - switch(mStatus) - { - case STATUS_LOADING: result = "loading"; break; - case STATUS_LOADED: result = "loaded"; break; - case STATUS_ERROR: result = "error"; break; - case STATUS_PLAYING: result = "playing"; break; - case STATUS_PAUSED: result = "paused"; break; - case STATUS_DONE: result = "done"; break; - default: - // keep the empty string - break; - } - - return result; + std::string result; + + switch(mStatus) + { + case STATUS_LOADING: result = "loading"; break; + case STATUS_LOADED: result = "loaded"; break; + case STATUS_ERROR: result = "error"; break; + case STATUS_PLAYING: result = "playing"; break; + case STATUS_PAUSED: result = "paused"; break; + case STATUS_DONE: result = "done"; break; + default: + // keep the empty string + break; + } + + return result; } - + /** * Set media status. - * + * * @param[in] status Media status (STATUS_LOADING, STATUS_PLAYING, STATUS_PAUSED, etc) * */ void MediaPluginBase::setStatus(EStatus status) { - if(mStatus != status) - { - mStatus = status; - sendStatus(); - } + if(mStatus != status) + { + mStatus = status; + sendStatus(); + } } /** * Receive message from plugin loader shell. - * + * * @param[in] message_string Message string * @param[in] user_data Message data * */ void MediaPluginBase::staticReceiveMessage(const char *message_string, void **user_data) { - MediaPluginBase *self = (MediaPluginBase*)*user_data; - - if(self != NULL) - { - self->receiveMessage(message_string); - - // If the plugin has processed the delete message, delete it. - if(self->mDeleteMe) - { - delete self; - *user_data = NULL; - } - } + MediaPluginBase *self = (MediaPluginBase*)*user_data; + + if(self != NULL) + { + self->receiveMessage(message_string); + + // If the plugin has processed the delete message, delete it. + if(self->mDeleteMe) + { + delete self; + *user_data = NULL; + } + } } /** * Send message to plugin loader shell. - * + * * @param[in] message Message data being sent to plugin loader shell * */ void MediaPluginBase::sendMessage(const LLPluginMessage &message) { - std::string output = message.generate(); - mHostSendFunction(output.c_str(), &mHostUserData); + std::string output = message.generate(); + mHostSendFunction(output.c_str(), &mHostUserData); } /** * Notifies plugin loader shell that part of display area needs to be redrawn. - * + * * @param[in] left Left X coordinate of area to redraw (0,0 is at top left corner) * @param[in] top Top Y coordinate of area to redraw (0,0 is at top left corner) * @param[in] right Right X-coordinate of area to redraw (0,0 is at top left corner) @@ -144,27 +144,27 @@ void MediaPluginBase::sendMessage(const LLPluginMessage &message) */ void MediaPluginBase::setDirty(int left, int top, int right, int bottom) { - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "updated"); - - message.setValueS32("left", left); - message.setValueS32("top", top); - message.setValueS32("right", right); - message.setValueS32("bottom", bottom); - - sendMessage(message); + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "updated"); + + message.setValueS32("left", left); + message.setValueS32("top", top); + message.setValueS32("right", right); + message.setValueS32("bottom", bottom); + + sendMessage(message); } /** * Sends "media_status" message to plugin loader shell ("loading", "playing", "paused", etc.) - * + * */ void MediaPluginBase::sendStatus() { - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "media_status"); + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "media_status"); - message.setValue("status", statusString()); - - sendMessage(message); + message.setValue("status", statusString()); + + sendMessage(message); } @@ -178,12 +178,12 @@ void MediaPluginBase::sendStatus() extern "C" { - LLSYMEXPORT int LLPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data); + LLSYMEXPORT int LLPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data); } /** * Plugin initialization and entry point. Establishes communication channel for messages between plugin and plugin loader shell. TODO:DOC - Please check! - * + * * @param[in] host_send_func Function for sending messages from plugin to plugin loader shell * @param[in] host_user_data Message data for messages from plugin to plugin loader shell * @param[out] plugin_send_func Function for plugin to receive messages from plugin loader shell @@ -195,12 +195,12 @@ extern "C" LLSYMEXPORT int LLPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data) { - return init_media_plugin(host_send_func, host_user_data, plugin_send_func, plugin_user_data); + return init_media_plugin(host_send_func, host_user_data, plugin_send_func, plugin_user_data); } #ifdef WIN32 int WINAPI DllEntryPoint( HINSTANCE hInstance, unsigned long reason, void* params ) { - return 1; + return 1; } #endif diff --git a/indra/media_plugins/base/media_plugin_base.h b/indra/media_plugins/base/media_plugin_base.h index 38b8226bb3..f65c712a66 100644 --- a/indra/media_plugins/base/media_plugin_base.h +++ b/indra/media_plugins/base/media_plugin_base.h @@ -1,4 +1,4 @@ -/** +/** * @file media_plugin_base.h * @brief Media plugin base class for LLMedia API plugin system * @@ -6,21 +6,21 @@ * $LicenseInfo:firstyear=2008&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library 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; * version 2.1 of the License only. - * + * * This library 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 this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ * @endcond @@ -36,94 +36,94 @@ class MediaPluginBase { public: - MediaPluginBase(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data); + MediaPluginBase(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data); /** Media plugin destructor. */ - virtual ~MediaPluginBase() {} + virtual ~MediaPluginBase() {} /** Handle received message from plugin loader shell. */ - virtual void receiveMessage(const char *message_string) = 0; - - static void staticReceiveMessage(const char *message_string, void **user_data); + virtual void receiveMessage(const char *message_string) = 0; + + static void staticReceiveMessage(const char *message_string, void **user_data); protected: /** Plugin status. */ - typedef enum - { - STATUS_NONE, - STATUS_LOADING, - STATUS_LOADED, - STATUS_ERROR, - STATUS_PLAYING, - STATUS_PAUSED, - STATUS_DONE - } EStatus; + typedef enum + { + STATUS_NONE, + STATUS_LOADING, + STATUS_LOADED, + STATUS_ERROR, + STATUS_PLAYING, + STATUS_PAUSED, + STATUS_DONE + } EStatus; /** Plugin shared memory. */ - class SharedSegmentInfo - { - public: + class SharedSegmentInfo + { + public: /** Shared memory address. */ - void *mAddress; + void *mAddress; /** Shared memory size. */ - size_t mSize; - }; + size_t mSize; + }; + + void sendMessage(const LLPluginMessage &message); + void sendStatus(); + std::string statusString(); + void setStatus(EStatus status); - void sendMessage(const LLPluginMessage &message); - void sendStatus(); - std::string statusString(); - void setStatus(EStatus status); - - /// Note: The quicktime plugin overrides this to add current time and duration to the message. - virtual void setDirty(int left, int top, int right, int bottom); + /// Note: The quicktime plugin overrides this to add current time and duration to the message. + virtual void setDirty(int left, int top, int right, int bottom); /** Map of shared memory names to shared memory. */ - typedef std::map<std::string, SharedSegmentInfo> SharedSegmentMap; + typedef std::map<std::string, SharedSegmentInfo> SharedSegmentMap; + - /** Function to send message from plugin to plugin loader shell. */ - LLPluginInstance::sendMessageFunction mHostSendFunction; + LLPluginInstance::sendMessageFunction mHostSendFunction; /** Message data being sent to plugin loader shell by mHostSendFunction. */ - void *mHostUserData; + void *mHostUserData; /** Flag to delete plugin instance (self). */ - bool mDeleteMe; + bool mDeleteMe; /** Pixel array to display. TODO:DOC are pixels always 24-bit RGB format, aligned on 32-bit boundary? Also: calling this a pixel array may be misleading since 1 pixel > 1 char. */ - unsigned char* mPixels; + unsigned char* mPixels; /** TODO:DOC what's this for -- does a texture have its own piece of shared memory? updated on size_change_request, cleared on shm_remove */ - std::string mTextureSegmentName; + std::string mTextureSegmentName; /** Width of plugin display in pixels. */ - int mWidth; + int mWidth; /** Height of plugin display in pixels. */ - int mHeight; + int mHeight; /** Width of plugin texture. */ - int mTextureWidth; + int mTextureWidth; /** Height of plugin texture. */ - int mTextureHeight; + int mTextureHeight; /** Pixel depth (pixel size in bytes). */ - int mDepth; + int mDepth; /** Current status of plugin. */ - EStatus mStatus; + EStatus mStatus; /** Map of shared memory segments. */ - SharedSegmentMap mSharedSegments; + SharedSegmentMap mSharedSegments; }; /** The plugin <b>must</b> define this function to create its instance. - * It should look something like this: + * It should look something like this: * @code - * { - * MediaPluginFoo *self = new MediaPluginFoo(host_send_func, host_user_data); - * *plugin_send_func = MediaPluginFoo::staticReceiveMessage; - * *plugin_user_data = (void*)self; - * - * return 0; - * } + * { + * MediaPluginFoo *self = new MediaPluginFoo(host_send_func, host_user_data); + * *plugin_send_func = MediaPluginFoo::staticReceiveMessage; + * *plugin_user_data = (void*)self; + * + * return 0; + * } * @endcode */ int init_media_plugin( - LLPluginInstance::sendMessageFunction host_send_func, - void *host_user_data, - LLPluginInstance::sendMessageFunction *plugin_send_func, - void **plugin_user_data); + LLPluginInstance::sendMessageFunction host_send_func, + void *host_user_data, + LLPluginInstance::sendMessageFunction *plugin_send_func, + void **plugin_user_data); |