Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 14:02:57 +02:00
Code Issues Releases Wiki Activity

NoteTrack channel buttons have prettier graphics in down position which now means ON; VEL_SLIDER depends on EXPERIMENTAL_MIDI_OUT (not USE_MIDI); velocity slider changes are labeled as such to Undo manager; fixed an OS X bug where backing bitmap does not get yellow highlight and then highlight on screen gets clobbered when user moves gain sliders (!); Added a high-level overview of redraw to TrackArtist.cpp.

Browse Source
This commit is contained in:
rbdannenberg
2010-10-28 17:34:35 +00:00
parent 932ca88255
commit f3b91514d2
5 changed files with 164 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/ASlider.cpp
View File

@@ -76,8 +76,8 @@ of an LWSlider or ASlider.
#include <wx/sysopt.h>
#endif
#include "ASlider.h"
#include "../Experimental.h"
#include "ASlider.h"
#include "../AColor.h"
#include "../ImageManipulation.h"
@@ -395,7 +395,7 @@ void LWSlider::SetStyle(int style)
mMaxValue = SPEED_MAX;
mStepValue = STEP_CONTINUOUS;
break;
#ifdef USE_MIDI
#ifdef EXPERIMENTAL_MIDI_OUT
case VEL_SLIDER:
mMinValue = VEL_MIN;
mMaxValue = VEL_MAX;
@@ -541,7 +541,7 @@ void LWSlider::CreatePopWin()
wxString maxStr = mName + wxT(": 000000");
if (mStyle == PAN_SLIDER || mStyle == DB_SLIDER || mStyle == SPEED_SLIDER
#ifdef USE_MIDI
#ifdef EXPERIMENTAL_MIDI_OUT
|| mStyle == VEL_SLIDER
#endif
)
@@ -917,7 +917,7 @@ void LWSlider::FormatPopWin()
case SPEED_SLIDER:
label.Printf(wxT("%s: %.2fx"), mName.c_str(), mCurrentValue);
break;
#ifdef USE_MIDI
#ifdef EXPERIMENTAL_MIDI_OUT
case VEL_SLIDER:
label.Printf(wxT("%s: %s%d"), mName.c_str(),
(mCurrentValue > 0.0f ? _("+") : _("")),
@@ -1543,7 +1543,7 @@ void ASlider::Set(float value)
mLWSlider->Set(value);
}
#ifdef USE_MIDI
#ifdef EXPERIMENTAL_MIDI_OUT
void ASlider::SetStyle(int style)
{
mStyle = style;
@@ -1785,7 +1785,7 @@ wxAccStatus ASliderAx::GetValue(int childId, wxString* strValue)
case SPEED_SLIDER:
strValue->Printf( wxT("%.0f"), as->mLWSlider->mCurrentValue * 100 );
break;
#ifdef USE_MIDI
#ifdef EXPERIMENTAL_MIDI_OUT
case VEL_SLIDER:
strValue->Printf( wxT("%.0f"), as->mLWSlider->mCurrentValue);
break;

4
src/widgets/ASlider.h
View File

@@ -39,7 +39,7 @@ class Ruler;
#define DB_SLIDER 2 // -36...36 dB
#define PAN_SLIDER 3 // -1.0...1.0
#define SPEED_SLIDER 4 // 0.01 ..3.0
#ifdef USE_MIDI
#ifdef EXPERIMENTAL_MIDI_OUT
#define VEL_SLIDER 5 // -50..50
#endif
@@ -257,7 +257,7 @@ class ASlider :public wxPanel
float Get( bool convert = true );
void Set(float value);
#ifdef USE_MIDI
#ifdef EXPERIMENTAL_MIDI_OUT
void SetStyle(int style);
#endif