mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Replace InitIcyBlue_Normal and InitIcyBlue_Selected with a single method which takes an audio rendering style as a parameter

Browse source 
Originally committed to SVN as r5883.
This commit is contained in:
Thomas Goyne 2011-11-18 22:57:36 +00:00
parent 13a281e9dc
commit 1eedb0c3d4
3 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
aegisub/src/audio_colorscheme.cpp
View file

@ -41,32 +41,41 @@
#endif #endif
#include "audio_colorscheme.h" #include "audio_colorscheme.h"
#include "audio_renderer.h"
#include "colorspace.h" #include "colorspace.h"
void AudioColorScheme::InitIcyBlue_Normal() #include <libaegisub/exception.h>
static int lum_icy_normal(float t)
{ {
return std::min(255, (int)(128 * 2 * t));
}
static int lum_icy_selected(float t)
{
return std::min(255, (int)(128 * (3 * t/2 + 0.5)));
}
void AudioColorScheme::InitIcyBlue(int audio_rendering_style)
{
int (*lum_func)(float);
switch (static_cast<AudioRenderingStyle>(audio_rendering_style))
{
case AudioStyle_Normal: lum_func = lum_icy_normal; break;
case AudioStyle_Inactive: lum_func = lum_icy_normal; break;
case AudioStyle_Active: lum_func = lum_icy_normal; break;
case AudioStyle_Selected: lum_func = lum_icy_selected; break;
default: throw agi::InternalError("Unknown audio rendering styling", 0);
}
unsigned char *palptr = palette; unsigned char *palptr = palette;
for (size_t i = 0; i <= factor; ++i) for (size_t i = 0; i <= factor; ++i)
{ {
float t = (float)i / factor; float t = (float)i / factor;
int H = (int)(255 * (1.5 - t) / 2); int H = (int)(255 * (1.5 - t) / 2);
int S = (int)(255 * (0.5 + t/2)); int S = (int)(255 * (0.5 + t/2));
int L = std::min(255, (int)(128 * 2 * t)); int L = lum_func(t);
hsl_to_rgb(H, S, L, palptr + 0, palptr + 1, palptr + 2);
palptr += 4;
}
}
void AudioColorScheme::InitIcyBlue_Selected()
{
unsigned char *palptr = palette;
for (size_t i = 0; i <= factor; ++i)
{
float t = (float)i / factor;
int H = (int)(255 * (1.5 - t) / 2);
int S = (int)(255 * (0.5 + t/2));
int L = std::min(255, (int)(128 * (3 * t/2 + 0.5)));
hsl_to_rgb(H, S, L, palptr + 0, palptr + 1, palptr + 2); hsl_to_rgb(H, S, L, palptr + 0, palptr + 1, palptr + 2);
palptr += 4; palptr += 4;
} }

7
aegisub/src/audio_colorscheme.h
View file

@ -85,10 +85,9 @@ public:
delete[] palette; delete[] palette;
} }
/// @brief Initialise the palette to the Aegisub 2.1 "Icy Blue" scheme (unselected) /// @brief Initialise the palette to the Aegisub 2.1 "Icy Blue" scheme
void InitIcyBlue_Normal(); /// @param audio_rendering_style AudioRenderingStyle to init this colorscheme for
/// @brief Initialise the palette to the Aegisub 2.1 "Icy Blue" scheme (selected) void InitIcyBlue(int audio_rendering_style);
void InitIcyBlue_Selected();
/// @brief Map a floating point value to RGB /// @brief Map a floating point value to RGB
/// @param val [in] The value to map from /// @param val [in] The value to map from

5
aegisub/src/audio_renderer_spectrum.cpp
View file

@ -127,11 +127,10 @@ AudioSpectrumRenderer::AudioSpectrumRenderer()
#endif #endif
, audio_scratch(0) , audio_scratch(0)
{ {
colors_normal.InitIcyBlue_Normal(); colors_normal.InitIcyBlue(AudioStyle_Normal);
colors_selected.InitIcyBlue_Selected(); colors_selected.InitIcyBlue(AudioStyle_Selected);
} }
AudioSpectrumRenderer::~AudioSpectrumRenderer() AudioSpectrumRenderer::~AudioSpectrumRenderer()
{ {
// This sequence will clean up // This sequence will clean up