[haiku-commits] haiku: hrev45173 - src/add-ons/media/media-add-ons/multi_audio
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 18 Jan 2013 20:34:27 +0100 (CET)
hrev45173 adds 1 changeset to branch 'master'
old head: 89b48debc2e995d1eb430f931cbd12daa4a96e8b
new head: fee167763070c6b29012ca67fab9a619dc19d74d
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=fee1677+%5E89b48de
----------------------------------------------------------------------------
fee1677: Added localization support for Haiku Multi Audio media addon.
Signed-off-by: Jerome Duval <jerome.duval@xxxxxxxxx>
[ Dancsó Róbert <dancso.robert@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45173
Commit: fee167763070c6b29012ca67fab9a619dc19d74d
URL: http://cgit.haiku-os.org/haiku/commit/?id=fee1677
Author: Dancsó Róbert <dancso.robert@xxxxxxxxxxxxx>
Date: Sat Dec 29 13:02:41 2012 UTC
Committer: Jerome Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Fri Jan 18 19:32:08 2013 UTC
----------------------------------------------------------------------------
3 files changed, 44 insertions(+), 10 deletions(-)
.../media/media-add-ons/multi_audio/Jamfile | 10 ++++++-
.../media-add-ons/multi_audio/MultiAudio.rdef | 15 ++++++++++
.../media-add-ons/multi_audio/MultiAudioNode.cpp | 29 ++++++++++++++------
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/media-add-ons/multi_audio/Jamfile
b/src/add-ons/media/media-add-ons/multi_audio/Jamfile
index 7f116b7..ab539cb 100644
--- a/src/add-ons/media/media-add-ons/multi_audio/Jamfile
+++ b/src/add-ons/media/media-add-ons/multi_audio/Jamfile
@@ -8,6 +8,8 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
SubDirC++Flags -fmultiple-symbol-spaces ;
}
+AddResources hmulti_audio.media_addon : MultiAudio.rdef ;
+
Addon hmulti_audio.media_addon :
MultiAudioAddOn.cpp
MultiAudioDevice.cpp
@@ -15,10 +17,16 @@ Addon hmulti_audio.media_addon :
MultiAudioUtility.cpp
Resampler.cpp
TimeComputer.cpp
- : be media $(TARGET_LIBSUPC++)
+ : be media $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
;
Package haiku-multi_audio-cvs
: hmulti_audio.media_addon
: boot home config add-ons media ;
+DoCatalogs hmulti_audio.media_addon
+ :
+ x-vnd.Haiku-hmulti_audio.media_addon
+ :
+ MultiAudioNode.cpp
+ ;
diff --git a/src/add-ons/media/media-add-ons/multi_audio/MultiAudio.rdef
b/src/add-ons/media/media-add-ons/multi_audio/MultiAudio.rdef
new file mode 100644
index 0000000..c6722d2
--- /dev/null
+++ b/src/add-ons/media/media-add-ons/multi_audio/MultiAudio.rdef
@@ -0,0 +1,15 @@
+/*
+ * MultiAudio.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-hmulti_audio.media_addon";
+
+resource app_version {
+ major = 1,
+ middle = 0,
+ minor = 0,
+ variety = 0,
+ internal = 0,
+ short_info = "1.0.0",
+ long_info = "Haiku MultiAudio media add-on."
+};
diff --git a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
index d417a88..ffac270 100644
--- a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
+++ b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
@@ -14,6 +14,7 @@
#include <Autolock.h>
#include <Buffer.h>
#include <BufferGroup.h>
+#include <Catalog.h>
#include <ParameterWeb.h>
#include <String.h>
@@ -26,6 +27,8 @@
#include "debug.h"
#include "Resampler.h"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MultiAudio"
#define PARAMETER_ID_INPUT_FREQUENCY 1
#define PARAMETER_ID_OUTPUT_FREQUENCY 2
@@ -103,10 +106,18 @@ static const sample_rate_info kSampleRateInfos[] = {
const char* kMultiControlString[] = {
"NAME IS ATTACHED",
- "Output", "Input", "Setup", "Tone Control", "Extended Setup", "Enhanced
Setup", "Master",
- "Beep", "Phone", "Mic", "Line", "CD", "Video", "Aux", "Wave", "Gain",
"Level", "Volume",
- "Mute", "Enable", "Stereo Mix", "Mono Mix", "Output Stereo Mix",
"Output Mono Mix", "Output Bass",
- "Output Treble", "Output 3D Center", "Output 3D Depth", "Headphones",
"SPDIF"
+ B_TRANSLATE("Output"), B_TRANSLATE("Input"), B_TRANSLATE("Setup"),
+ B_TRANSLATE("Tone control"), B_TRANSLATE("Extended Setup"),
+ B_TRANSLATE("Enhanced Setup"), B_TRANSLATE("Master"),
B_TRANSLATE("Beep"),
+ B_TRANSLATE("Phone"), B_TRANSLATE("Mic"), B_TRANSLATE("Line"),
+ B_TRANSLATE("CD"), B_TRANSLATE("Video"), B_TRANSLATE("Aux"),
+ B_TRANSLATE("Wave"), B_TRANSLATE("Gain"), B_TRANSLATE("Level"),
+ B_TRANSLATE("Volume"), B_TRANSLATE("Mute"), B_TRANSLATE("Enable"),
+ B_TRANSLATE("Stereo mix"), B_TRANSLATE("Mono mix"),
+ B_TRANSLATE("Output stereo mix"), B_TRANSLATE("Output mono mix"),
+ B_TRANSLATE("Output bass"), B_TRANSLATE("Output treble"),
+ B_TRANSLATE("Output 3D center"), B_TRANSLATE("Output 3D depth"),
+ B_TRANSLATE("Headphones"), B_TRANSLATE("SPDIF")
};
@@ -1579,17 +1590,17 @@ MultiAudioNode::MakeParameterWeb()
PRINT(("MixControlInfo().control_count : %li\n",
fDevice->MixControlInfo().control_count));
- BParameterGroup* generalGroup = web->MakeGroup("General");
+ BParameterGroup* generalGroup = web->MakeGroup(B_TRANSLATE("General"));
const multi_description& description = fDevice->Description();
if (description.output_rates & B_SR_SAME_AS_INPUT) {
- _CreateFrequencyParameterGroup(generalGroup, "Input & Output",
+ _CreateFrequencyParameterGroup(generalGroup, B_TRANSLATE("Input
& Output"),
PARAMETER_ID_INPUT_FREQUENCY, description.input_rates);
} else {
- _CreateFrequencyParameterGroup(generalGroup, "Input",
+ _CreateFrequencyParameterGroup(generalGroup,
B_TRANSLATE("Input"),
PARAMETER_ID_INPUT_FREQUENCY, description.input_rates);
- _CreateFrequencyParameterGroup(generalGroup, "Output",
+ _CreateFrequencyParameterGroup(generalGroup,
B_TRANSLATE("Output"),
PARAMETER_ID_OUTPUT_FREQUENCY,
description.output_rates);
}
@@ -1719,7 +1730,7 @@
MultiAudioNode::_CreateFrequencyParameterGroup(BParameterGroup* parentGroup,
{
BParameterGroup* group = parentGroup->MakeGroup(name);
BDiscreteParameter* frequencyParam = group->MakeDiscreteParameter(
- parameterID, B_MEDIA_NO_TYPE, BString(name) << " Frequency:",
+ parameterID, B_MEDIA_NO_TYPE, BString(name) << B_TRANSLATE("
frequency:"),
B_GENERIC);
for (int32 i = 0; kSampleRateInfos[i].name != NULL; i++) {
Other related posts:
- » [haiku-commits] haiku: hrev45173 - src/add-ons/media/media-add-ons/multi_audio - korli
