mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-15 00:24:19 +00:00
Code Activity

Introjucer: added some android manifest options, and fixed audio input permissions for the demo app.

Browse source
This commit is contained in:
jules 2012-02-21 10:02:10 +00:00
parent d3d391ae7f
commit 092a0166cc
6 changed files with 62 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp
View file

@ -704,20 +704,12 @@ public:
for (int i = 0; i < items.size(); i += 2)
{
const String name (items[i]);
const String name2 (items[i + 1]);
String commonBit;
const String& name = items[i];
for (int j = 0; j < name.length(); ++j)
if (name.substring (0, j).equalsIgnoreCase (name2.substring (0, j)))
commonBit = name.substring (0, j);
// Make sure we only split the name at a space, because otherwise, things
// like "input 11" + "input 12" would become "input 11 + 2"
while (commonBit.isNotEmpty() && ! CharacterFunctions::isWhitespace (commonBit.getLastCharacter()))
commonBit = commonBit.dropLastCharacters (1);
pairs.add (name.trim() + " + " + name2.substring (commonBit.length()).trim());
if (i + 1 >= items.size())
pairs.add (name.trim());
else
pairs.add (getNameForChannelPair (name, items[i + 1]));
}
items = pairs;
@ -820,6 +812,22 @@ public:
const String noItemsMessage;
StringArray items;
static String getNameForChannelPair (const String& name1, const String& name2)
{
String commonBit;
for (int j = 0; j < name1.length(); ++j)
if (name1.substring (0, j).equalsIgnoreCase (name2.substring (0, j)))
commonBit = name1.substring (0, j);
// Make sure we only split the name at a space, because otherwise, things
// like "input 11" + "input 12" would become "input 11 + 2"
while (commonBit.isNotEmpty() && ! CharacterFunctions::isWhitespace (commonBit.getLastCharacter()))
commonBit = commonBit.dropLastCharacters (1);
return name1.trim() + " + " + name2.substring (commonBit.length()).trim();
}
void flipEnablement (const int row)
{
jassert (type == audioInputType || type == audioOutputType);

5
modules/juce_gui_basics/juce_gui_basics.cpp
View file

@ -248,6 +248,9 @@ using namespace juce;
//==============================================================================
namespace juce
{
#if JUCE_IOS || JUCE_WINDOWS
#include "native/juce_MultiTouchMapper.h"
#endif
#if JUCE_MAC || JUCE_IOS
#include "../juce_core/native/juce_osx_ObjCHelpers.h"
@ -256,7 +259,6 @@ namespace juce
#include "../juce_graphics/native/juce_mac_CoreGraphicsContext.h"
#if JUCE_IOS
#include "native/juce_MultiTouchMapper.h"
#include "native/juce_ios_UIViewComponentPeer.mm"
#include "native/juce_ios_Windowing.mm"
#else
@ -271,7 +273,6 @@ namespace juce
#elif JUCE_WINDOWS
#include "../juce_core/native/juce_win32_ComSmartPtr.h"
#include "../juce_events/native/juce_win32_HiddenMessageWindow.h"
#include "native/juce_MultiTouchMapper.h"
#include "native/juce_win32_Windowing.cpp"
#include "native/juce_win32_DragAndDrop.cpp"
#include "native/juce_win32_FileChooser.cpp"