hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'stable-1.1'

Browse Source 
Conflicts:
	src/core/main.cpp
This commit is contained in:
Vesa
2014-11-16 22:22:48 +02:00
parent a99ea9fa6b 208bfe356c
commit cd509b707b
12 changed files with 144 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/knob.h
View File

@@ -136,7 +136,7 @@ private slots:
virtual void enterValue();
void displayHelp();
void friendlyUpdate();
void toggleScale();
private:
QString displayValue() const;

15
include/lmms_constants.h
View File

@@ -25,10 +25,15 @@
#ifndef LMMS_CONSTANTS_H
#define LMMS_CONSTANTS_H
const float F_PI = 3.1415926535f;
const float F_E = 2.718281828459045f;
const float F_2PI = 2*F_PI;
const float F_PI_2 = F_PI*0.5;
const double D_PI = 3.14159265358979323846;
const double D_2PI = D_PI * 2.0;
const double D_PI_2 = D_PI * 0.5;
const double D_E = 2.71828182845904523536;
const float F_PI = (float) D_PI;
const float F_2PI = (float) D_2PI;
const float F_PI_2 = (float) D_PI_2;
const float F_E = (float) D_E;
#endif