chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Volume slider changes (new branch) #358

Merged
shohallan merged 1 commit from volume-patch into main 2023-06-08 05:10:16 -04:00
Conversation 0 Commits 1 Files changed 3 +10 -10
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Audio/Helper.h
View file

@ -7,5 +7,5 @@
* *
*/ */
double logarithmicToLinear(double logarithmic, double MAX_VOLUME); double logarithmicToLinear(const double logarithmic, double MAX_VOLUME);
double linearToLogarithmic(double linear, double MAX_VOLUME); double linearToLogarithmic(const double linear, double MAX_VOLUME);

10
Audio/Helper.m
View file

@ -13,13 +13,13 @@
// These functions are helpers for the process of converting volume from a linear to logarithmic scale. // These functions are helpers for the process of converting volume from a linear to logarithmic scale.
// Numbers that goes in to audioPlayer should be logarithmic. Numbers that are displayed to the user should be linear. // Numbers that goes in to audioPlayer should be logarithmic. Numbers that are displayed to the user should be linear.
// Here's why: http://www.dr-lex.34sp.com/info-stuff/volumecontrols.html // Here's why: http://www.dr-lex.34sp.com/info-stuff/volumecontrols.html
// We are using the approximation of X^4. // We are using the approximation of X^2 when volume is limited to 100% and X^4 when volume is limited to 800%.
// Input/Output values are in percents. // Input/Output values are in percents.
double logarithmicToLinear(double logarithmic, double MAX_VOLUME) { double logarithmicToLinear(const double logarithmic, double MAX_VOLUME) {
return (MAX_VOLUME == 100.0) ? logarithmic : pow((logarithmic / MAX_VOLUME), 0.25) * 100.0; return (MAX_VOLUME == 100.0) ? pow((logarithmic / MAX_VOLUME), 0.5) * 100.0 : pow((logarithmic / MAX_VOLUME), 0.25) * 100.0;
} }
double linearToLogarithmic(double linear, double MAX_VOLUME) { double linearToLogarithmic(const double linear, double MAX_VOLUME) {
return (MAX_VOLUME == 100.0) ? linear : (linear / 100.0) * (linear / 100.0) * (linear / 100.0) * (linear / 100.0) * MAX_VOLUME; return (MAX_VOLUME == 100.0) ? (linear / 100.0) * (linear / 100.0) * MAX_VOLUME : (linear / 100.0) * (linear / 100.0) * (linear / 100.0) * (linear / 100.0) * MAX_VOLUME;
} }
// End helper volume function thingies. ONWARDS TO GLORY! // End helper volume function thingies. ONWARDS TO GLORY!

6
Window/VolumeSlider.m
View file

@ -60,9 +60,9 @@ static void *kVolumeSliderContext = &kVolumeSliderContext;
} }
- (void)updateToolTip { - (void)updateToolTip {
double value = [self doubleValue]; const double value = [self doubleValue];
double volume; // Sets volume to be the slider value if limit is set to 100% or the actual volume otherwise.
volume = linearToLogarithmic(value, MAX_VOLUME); const double volume = (MAX_VOLUME == 100) ? value : linearToLogarithmic(value, MAX_VOLUME);
NSString *text; NSString *text;
// If volume becomes less than 1%, display two decimal digits of precision (e.g. 0.34%). // If volume becomes less than 1%, display two decimal digits of precision (e.g. 0.34%).