Split plugin classes and derive AIFilePicker from BasicPluginBase (part 3).
This commit deletes all indra/media_plugins and copied one-on-one the indra/plugins directory from my (imprudence) statemachine branch (which contains the AIFilePicker patch). git shows this as a lot of 'renamed' files because originally it was a rename. However, there are a lot of changes as well: it's both an upgrade to a newer plugin system (changes by LL) as well as an upgrade to my refactored plugin system with a file picker as plugin. Since this commit is a one-on-one copy, it disregards any changes that were in Singularity and not in imprudence in indra/media_plugins however. I will add those back in the next commit.
This commit is contained in:
68
indra/plugins/example_basic/CMakeLists.txt
Normal file
68
indra/plugins/example_basic/CMakeLists.txt
Normal file
@@ -0,0 +1,68 @@
|
||||
# -*- cmake -*-
|
||||
|
||||
project(basic_plugin_example)
|
||||
|
||||
include(00-Common)
|
||||
include(LLCommon)
|
||||
include(LLPlugin)
|
||||
include(Linking)
|
||||
include(PluginAPI)
|
||||
include(BasicPluginBase)
|
||||
|
||||
include_directories(
|
||||
${LLPLUGIN_INCLUDE_DIRS}
|
||||
${LLCOMMON_INCLUDE_DIRS}
|
||||
${BASIC_PLUGIN_BASE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
### basic_plugin_example
|
||||
|
||||
if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
|
||||
if(WINDOWS)
|
||||
add_definitions(/FIXED:NO)
|
||||
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
|
||||
add_definitions(-fPIC)
|
||||
endif(WINDOWS)
|
||||
endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
|
||||
|
||||
set(basic_plugin_example_SOURCE_FILES
|
||||
basic_plugin_example.cpp
|
||||
)
|
||||
|
||||
add_library(basic_plugin_example
|
||||
SHARED
|
||||
${basic_plugin_example_SOURCE_FILES}
|
||||
)
|
||||
|
||||
target_link_libraries(basic_plugin_example
|
||||
${LLPLUGIN_LIBRARIES}
|
||||
${LLCOMMON_LIBRARIES}
|
||||
${BASIC_PLUGIN_BASE_LIBRARIES}
|
||||
)
|
||||
|
||||
add_dependencies(basic_plugin_example
|
||||
${LLPLUGIN_LIBRARIES}
|
||||
${LLCOMMON_LIBRARIES}
|
||||
${BASIC_PLUGIN_BASE_LIBRARIES}
|
||||
)
|
||||
|
||||
if (WINDOWS)
|
||||
set_target_properties(
|
||||
basic_plugin_example
|
||||
PROPERTIES
|
||||
LINK_FLAGS "/MANIFEST:NO"
|
||||
)
|
||||
endif (WINDOWS)
|
||||
|
||||
if (DARWIN)
|
||||
# Don't prepend 'lib' to the executable name, and don't embed a full path in the library's install name
|
||||
set_target_properties(
|
||||
basic_plugin_example
|
||||
PROPERTIES
|
||||
PREFIX ""
|
||||
BUILD_WITH_INSTALL_RPATH 1
|
||||
INSTALL_NAME_DIR "@executable_path"
|
||||
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base_basic/basic_plugin_base.exp"
|
||||
)
|
||||
|
||||
endif (DARWIN)
|
||||
123
indra/plugins/example_basic/basic_plugin_example.cpp
Normal file
123
indra/plugins/example_basic/basic_plugin_example.cpp
Normal file
@@ -0,0 +1,123 @@
|
||||
/**
|
||||
* @file basic_plugin_example.cpp
|
||||
* @brief Example Plugin for a basic plugin.
|
||||
*
|
||||
* @cond
|
||||
* $LicenseInfo:firstyear=2010&license=viewergpl$
|
||||
*
|
||||
* Copyright (c) 2010, Linden Research, Inc.
|
||||
*
|
||||
* Second Life Viewer Source Code
|
||||
* The source code in this file ("Source Code") is provided by Linden Lab
|
||||
* to you under the terms of the GNU General Public License, version 2.0
|
||||
* ("GPL"), unless you have obtained a separate licensing agreement
|
||||
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
||||
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
||||
* online at http://secondlife.com/developers/opensource/gplv2
|
||||
*
|
||||
* There are special exceptions to the terms and conditions of the GPL as
|
||||
* it is applied to this Source Code. View the full text of the exception
|
||||
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
||||
* online at
|
||||
* http://secondlife.com/developers/opensource/flossexception
|
||||
*
|
||||
* By copying, modifying or distributing this software, you acknowledge
|
||||
* that you have read and understood your obligations described above,
|
||||
* and agree to abide by those obligations.
|
||||
*
|
||||
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
||||
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
||||
* COMPLETENESS OR PERFORMANCE.
|
||||
* $/LicenseInfo$
|
||||
*
|
||||
* @endcond
|
||||
*/
|
||||
|
||||
#include "linden_common.h"
|
||||
#include "basic_plugin_base.h"
|
||||
|
||||
class BasicPluginExample : public BasicPluginBase
|
||||
{
|
||||
public:
|
||||
BasicPluginExample(LLPluginInstance::sendMessageFunction send_message_function, LLPluginInstance* plugin_instance);
|
||||
~BasicPluginExample();
|
||||
|
||||
/*virtual*/ void receiveMessage(char const* message_string);
|
||||
|
||||
private:
|
||||
bool init();
|
||||
};
|
||||
|
||||
BasicPluginExample::BasicPluginExample(LLPluginInstance::sendMessageFunction send_message_function, LLPluginInstance* plugin_instance) :
|
||||
BasicPluginBase(send_message_function, plugin_instance)
|
||||
{
|
||||
}
|
||||
|
||||
BasicPluginExample::~BasicPluginExample()
|
||||
{
|
||||
}
|
||||
|
||||
void BasicPluginExample::receiveMessage(char const* message_string)
|
||||
{
|
||||
LLPluginMessage message_in;
|
||||
|
||||
if (message_in.parse(message_string) >= 0)
|
||||
{
|
||||
std::string message_class = message_in.getClass();
|
||||
std::string message_name = message_in.getName();
|
||||
|
||||
if (message_class == LLPLUGIN_MESSAGE_CLASS_BASE)
|
||||
{
|
||||
if (message_name == "init")
|
||||
{
|
||||
LLPluginMessage message("base", "init_response");
|
||||
LLSD versions = LLSD::emptyMap();
|
||||
versions[LLPLUGIN_MESSAGE_CLASS_BASE] = LLPLUGIN_MESSAGE_CLASS_BASE_VERSION;
|
||||
versions[LLPLUGIN_MESSAGE_CLASS_BASIC] = LLPLUGIN_MESSAGE_CLASS_BASIC_VERSION;
|
||||
message.setValueLLSD("versions", versions);
|
||||
|
||||
std::string plugin_version = "Basic Plugin Example, version 1.0.0.0";
|
||||
message.setValue("plugin_version", plugin_version);
|
||||
sendMessage(message);
|
||||
}
|
||||
else if (message_name == "idle")
|
||||
{
|
||||
// This whole message should not have existed imho -- Aleric
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cerr << "BasicPluginExample::receiveMessage: unknown base message: " << message_name << std::endl;
|
||||
}
|
||||
}
|
||||
else if (message_class == LLPLUGIN_MESSAGE_CLASS_BASIC)
|
||||
{
|
||||
if (message_name == "poke")
|
||||
{
|
||||
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_BASIC, "pokeback");
|
||||
sendMessage(message);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cerr << "BasicPluginExample::receiveMessage: unknown message class: " << message_class << std::endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool BasicPluginExample::init(void)
|
||||
{
|
||||
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_BASIC, "name_text");
|
||||
message.setValue("name", "Basic Plugin Example");
|
||||
sendMessage(message);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int create_plugin(LLPluginInstance::sendMessageFunction send_message_function,
|
||||
LLPluginInstance* plugin_instance,
|
||||
BasicPluginBase** plugin_object)
|
||||
{
|
||||
*plugin_object = new BasicPluginExample(send_message_function, plugin_instance);
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user