livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

master
Eli Linden 2010-04-09 18:37:55 -07:00
parent 113e2226db c645df97e7
commit d86dc7bc95
7 changed files with 267 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/media_plugins/webkit/CMakeLists.txt
View File

@ -45,12 +45,16 @@ set(media_plugin_webkit_LINK_LIBRARIES
${PULSEAUDIO_LIBRARIES}
)
if (LINUX)
# Select which VolumeCatcher implementation to use
if (LINUX AND PULSEAUDIO)
list(APPEND media_plugin_webkit_SOURCE_FILES linux_volume_catcher.cpp)
list(APPEND media_plugin_webkit_LINK_LIBRARIES
${UI_LIBRARIES} # for glib/GTK
)
endif (LINUX)
else (LINUX AND PULSEAUDIO)
# All other platforms use the dummy volume catcher for now.
list(APPEND media_plugin_webkit_SOURCE_FILES dummy_volume_catcher.cpp)
endif (LINUX AND PULSEAUDIO)
add_library(media_plugin_webkit
SHARED

63
indra/media_plugins/webkit/dummy_volume_catcher.cpp Normal file
View File

@ -0,0 +1,63 @@
/**
* @file dummy_volume_catcher.cpp
* @brief A null implementation of the "VolumeCatcher" class for platforms where it's not implemented yet.
*
* @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 "volume_catcher.h"
class VolumeCatcherImpl
{
};
/////////////////////////////////////////////////////
VolumeCatcher::VolumeCatcher()
{
pimpl = NULL;
}
VolumeCatcher::~VolumeCatcher()
{
}
void VolumeCatcher::setVolume(F32 volume)
{
}
void VolumeCatcher::setPan(F32 pan)
{
}
void VolumeCatcher::pump()
{
}

74
indra/media_plugins/webkit/linux_volume_catcher.cpp
View File

@ -42,11 +42,9 @@
#include "linden_common.h"
#include "linux_volume_catcher.h"
#include "volume_catcher.h"
#if LL_PULSEAUDIO_ENABLED
extern "C" {
#include <glib.h>
@ -161,11 +159,11 @@ extern "C" {
}
class LinuxVolumeCatcherImpl
class VolumeCatcherImpl
{
public:
LinuxVolumeCatcherImpl();
~LinuxVolumeCatcherImpl();
VolumeCatcherImpl();
~VolumeCatcherImpl();
void setVolume(F32 volume);
void pump(void);
@ -189,7 +187,7 @@ public:
bool mGotSyms;
};
LinuxVolumeCatcherImpl::LinuxVolumeCatcherImpl()
VolumeCatcherImpl::VolumeCatcherImpl()
: mDesiredVolume(0.0f),
mMainloop(NULL),
mPAContext(NULL),
@ -199,17 +197,17 @@ LinuxVolumeCatcherImpl::LinuxVolumeCatcherImpl()
init();
}
LinuxVolumeCatcherImpl::~LinuxVolumeCatcherImpl()
VolumeCatcherImpl::~VolumeCatcherImpl()
{
cleanup();
}
bool LinuxVolumeCatcherImpl::loadsyms(std::string pulse_dso_name)
bool VolumeCatcherImpl::loadsyms(std::string pulse_dso_name)
{
return grab_pa_syms(pulse_dso_name);
}
void LinuxVolumeCatcherImpl::init()
void VolumeCatcherImpl::init()
{
// try to be as defensive as possible because PA's interface is a
// bit fragile and (for our purposes) we'd rather simply not function
@ -262,7 +260,7 @@ void LinuxVolumeCatcherImpl::init()
}
}
void LinuxVolumeCatcherImpl::cleanup()
void VolumeCatcherImpl::cleanup()
{
mConnected = false;
@ -280,7 +278,7 @@ void LinuxVolumeCatcherImpl::cleanup()
mMainloop = NULL;
}
void LinuxVolumeCatcherImpl::setVolume(F32 volume)
void VolumeCatcherImpl::setVolume(F32 volume)
{
mDesiredVolume = volume;
@ -294,13 +292,13 @@ void LinuxVolumeCatcherImpl::setVolume(F32 volume)
pump();
}
void LinuxVolumeCatcherImpl::pump()
void VolumeCatcherImpl::pump()
{
gboolean may_block = FALSE;
g_main_context_iteration(g_main_context_default(), may_block);
}
void LinuxVolumeCatcherImpl::connected_okay()
void VolumeCatcherImpl::connected_okay()
{
pa_operation *op;
@ -324,7 +322,7 @@ void LinuxVolumeCatcherImpl::connected_okay()
}
}
void LinuxVolumeCatcherImpl::update_all_volumes(F32 volume)
void VolumeCatcherImpl::update_all_volumes(F32 volume)
{
for (std::set<U32>::iterator it = mSinkInputIndices.begin();
it != mSinkInputIndices.end(); ++it)
@ -333,7 +331,7 @@ void LinuxVolumeCatcherImpl::update_all_volumes(F32 volume)
}
}
void LinuxVolumeCatcherImpl::update_index_volume(U32 index, F32 volume)
void VolumeCatcherImpl::update_index_volume(U32 index, F32 volume)
{
static pa_cvolume cvol;
llpa_cvolume_set(&cvol, mSinkInputNumChannels[index],
@ -355,7 +353,7 @@ void LinuxVolumeCatcherImpl::update_index_volume(U32 index, F32 volume)
void callback_discovered_sinkinput(pa_context *context, const pa_sink_input_info *sii, int eol, void *userdata)
{
LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>((LinuxVolumeCatcherImpl*)userdata);
VolumeCatcherImpl *impl = dynamic_cast<VolumeCatcherImpl*>((VolumeCatcherImpl*)userdata);
llassert(impl);
if (0 == eol)
@ -386,7 +384,7 @@ void callback_discovered_sinkinput(pa_context *context, const pa_sink_input_info
void callback_subscription_alert(pa_context *context, pa_subscription_event_type_t t, uint32_t index, void *userdata)
{
LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>((LinuxVolumeCatcherImpl*)userdata);
VolumeCatcherImpl *impl = dynamic_cast<VolumeCatcherImpl*>((VolumeCatcherImpl*)userdata);
llassert(impl);
switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) {
@ -420,7 +418,7 @@ void callback_subscription_alert(pa_context *context, pa_subscription_event_type
void callback_context_state(pa_context *context, void *userdata)
{
LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>((LinuxVolumeCatcherImpl*)userdata);
VolumeCatcherImpl *impl = dynamic_cast<VolumeCatcherImpl*>((VolumeCatcherImpl*)userdata);
llassert(impl);
switch (llpa_context_get_state(context))
@ -441,48 +439,30 @@ void callback_context_state(pa_context *context, void *userdata)
/////////////////////////////////////////////////////
LinuxVolumeCatcher::LinuxVolumeCatcher()
VolumeCatcher::VolumeCatcher()
{
pimpl = new LinuxVolumeCatcherImpl();
pimpl = new VolumeCatcherImpl();
}
LinuxVolumeCatcher::~LinuxVolumeCatcher()
VolumeCatcher::~VolumeCatcher()
{
delete pimpl;
pimpl = NULL;
}
void LinuxVolumeCatcher::setVolume(F32 volume)
void VolumeCatcher::setVolume(F32 volume)
{
llassert(pimpl);
pimpl->setVolume(volume);
}
void LinuxVolumeCatcher::pump()
void VolumeCatcher::setPan(F32 pan)
{
// TODO: implement this (if possible)
}
void VolumeCatcher::pump()
{
llassert(pimpl);
pimpl->pump();
}
#else // !LL_PULSEAUDIO_ENABLED
// stub.
LinuxVolumeCatcher::LinuxVolumeCatcher()
{
pimpl = NULL;
}
LinuxVolumeCatcher::~LinuxVolumeCatcher()
{
}
void LinuxVolumeCatcher::setVolume(F32 volume)
{
}
void LinuxVolumeCatcher::pump()
{
}
#endif // LL_PULSEAUDIO_ENABLED

16
indra/media_plugins/webkit/media_plugin_webkit.cpp
View File

@ -50,9 +50,7 @@
# define LL_QTWEBKIT_USES_PIXMAPS 0
#endif // LL_LINUX
#if LL_LINUX
# include "linux_volume_catcher.h"
#endif // LL_LINUX
# include "volume_catcher.h"
#if LL_WINDOWS
# include <direct.h>
@ -119,9 +117,7 @@ private:
F32 mBackgroundG;
F32 mBackgroundB;
#if LL_LINUX
LinuxVolumeCatcher mLinuxVolumeCatcher;
#endif // LL_LINUX
VolumeCatcher mVolumeCatcher;
void setInitState(int state)
{
@ -135,9 +131,7 @@ private:
{
LLQtWebKit::getInstance()->pump( milliseconds );
#if LL_LINUX
mLinuxVolumeCatcher.pump();
#endif // LL_LINUX
mVolumeCatcher.pump();
checkEditState();
@ -1139,9 +1133,7 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
void MediaPluginWebKit::setVolume(F32 volume)
{
#if LL_LINUX
mLinuxVolumeCatcher.setVolume(volume);
#endif // LL_LINUX
mVolumeCatcher.setVolume(volume);
}
int init_media_plugin(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data)

59
indra/media_plugins/webkit/volume_catcher.h Normal file
View File

@ -0,0 +1,59 @@
/**
* @file volume_catcher.h
* @brief Interface to a class with platform-specific implementations that allows control of the audio volume of all sources in the current process.
*
* @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
*/
#ifndef VOLUME_CATCHER_H
#define VOLUME_CATCHER_H
#include "linden_common.h"
class VolumeCatcherImpl;
class VolumeCatcher
{
public:
VolumeCatcher();
~VolumeCatcher();
void setVolume(F32 volume); // 0.0 - 1.0
// Set the left-right pan of audio sources
// where -1.0 = left, 0 = center, and 1.0 = right
void setPan(F32 pan);
void pump(); // call this at least a few times a second if you can - it affects how quickly we can 'catch' a new audio source and adjust its volume
private:
VolumeCatcherImpl *pimpl;
};
#endif // VOLUME_CATCHER_H

152
indra/newview/skins/default/xui/en/floater_animation_preview.xml
View File

@ -333,66 +333,86 @@ Maximum animation length is [MAX_LENGTH] seconds.
left_pad="20"
name="emote_combo"
tool_tip="Controls what face does during animation">
<combo_box.item
label="(None)"
name="[None]" />
<combo_box.item
label="Aaaaah"
name="Aaaaah" />
<combo_box.item
label="Afraid"
name="Afraid" />
<combo_box.item
label="Angry"
name="Angry" />
<combo_box.item
label="Big Smile"
name="BigSmile" />
<combo_box.item
label="Bored"
name="Bored" />
<combo_box.item
label="Cry"
name="Cry" />
<combo_box.item
label="Disdain"
name="Disdain" />
<combo_box.item
label="Embarrassed"
name="Embarrassed" />
<combo_box.item
label="Frown"
name="Frown" />
<combo_box.item
label="Kiss"
name="Kiss" />
<combo_box.item
label="Laugh"
name="Laugh" />
<combo_box.item
label="Plllppt"
name="Plllppt" />
<combo_box.item
label="Repulsed"
name="Repulsed" />
<combo_box.item
label="Sad"
name="Sad" />
<combo_box.item
label="Shrug"
name="Shrug" />
<combo_box.item
label="Smile"
name="Smile" />
<combo_box.item
label="Surprise"
name="Surprise" />
<combo_box.item
label="Wink"
name="Wink" />
<combo_box.item
label="Worry"
name="Worry" />
<item
label="(None)"
value=""
name="[None]" />
<item
label="Aaaaah"
value="Aaaaah"
name="Aaaaah" />
<item
label="Afraid"
value="Afraid"
name="Afraid" />
<item
label="Angry"
value="Angry"
name="Angry" />
<item
label="Big Smile"
value="Big Smile"
name="BigSmile" />
<item
label="Bored"
value="Bored"
name="Bored" />
<item
label="Cry"
value="Cry"
name="Cry" />
<item
label="Disdain"
value="Disdain"
name="Disdain" />
<item
label="Embarrassed"
value="Embarrassed"
name="Embarrassed" />
<item
label="Frown"
value="Frown"
name="Frown" />
<item
label="Kiss"
value="Kiss"
name="Kiss" />
<item
label="Laugh"
value="Laugh"
name="Laugh" />
<item
label="Plllppt"
value="Plllppt"
name="Plllppt" />
<item
label="Repulsed"
value="Repulsed"
name="Repulsed" />
<item
label="Sad"
value="Sad"
name="Sad" />
<item
label="Shrug"
value="Shrug"
name="Shrug" />
<item
label="Smile"
value="Smile"
name="Smile" />
<item
label="Surprise"
value="Surprise"
name="Surprise" />
<item
label="Wink"
value="Wink"
name="Wink" />
<item
label="Worry"
value="Worry"
name="Worry" />
</combo_box>
<text
type="string"
@ -414,17 +434,21 @@ Maximum animation length is [MAX_LENGTH] seconds.
left_pad="20"
name="preview_base_anim"
tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
<combo_box.item
<item
label="Standing"
value="Standing"
name="Standing" />
<combo_box.item
<item
label="Walking"
value="Walking"
name="Walking" />
<combo_box.item
<item
label="Sitting"
value="Sitting"
name="Sitting" />
<combo_box.item
<item
label="Flying"
value="Flying"
name="Flying" />
</combo_box>
<spinner

30
indra/newview/skins/default/xui/en/floater_image_preview.xml
View File

@ -64,35 +64,45 @@
name="clothing_type_combo"
top_delta="3"
width="160">
<combo_box.item
<item
label="Image"
value="Image"
name="Image" />
<combo_box.item
<item
label="Hair"
value="Hair"
name="Hair" />
<combo_box.item
<item
label="Female Head"
value="Female Head"
name="FemaleHead" />
<combo_box.item
<item
label="Female Upper Body"
value="Female Upper Body"
name="FemaleUpperBody" />
<combo_box.item
<item
label="Female Lower Body"
value="Female Lower Body"
name="FemaleLowerBody" />
<combo_box.item
<item
label="Male Head"
value="Male Head"
name="MaleHead" />
<combo_box.item
<item
label="Male Upper Body"
value="Male Upper Body"
name="MaleUpperBody" />
<combo_box.item
<item
label="Male Lower Body"
value="Male Lower Body"
name="MaleLowerBody" />
<combo_box.item
<item
label="Skirt"
value="Skirt"
name="Skirt" />
<combo_box.item
<item
label="Sculpted Prim"
value="Sculpted Prim"
name="SculptedPrim" />
</combo_box>
<text