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

use upgraded surround area

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@189 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2006-07-02 21:35:40 +00:00
parent 87e2cf6292
commit 166a840657
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/instrument_track.h
View File

@@ -120,7 +120,6 @@ public:
void FASTCALL setVolume( volume _new_volume );
volume getVolume( void ) const;
void FASTCALL setSurroundAreaPos( const QPoint & _p );
const QPoint & surroundAreaPos( void ) const;
void FASTCALL setBaseNote( Uint32 _new_note );

21
src/tracks/instrument_track.cpp
View File

@@ -239,7 +239,8 @@ instrumentTrack::instrumentTrack( trackContainer * _tc ) :
// setup surround-area
m_surroundArea = new surroundArea( m_generalSettingsWidget );
m_surroundArea = new surroundArea( m_generalSettingsWidget,
tr( "Surround area" ), eng(), this );
m_surroundArea->move( 20 + m_volumeKnob->width(), 38 );
m_surroundArea->show();
#ifdef QT4
@@ -813,14 +814,6 @@ void instrumentTrack::setSurroundAreaPos( const QPoint & _p )
const QPoint & instrumentTrack::surroundAreaPos( void ) const
{
return( m_surroundArea->value() );
}
void instrumentTrack::setBaseNote( Uint32 _new_note )
{
setBaseTone( (tones)( _new_note % NOTES_PER_OCTAVE ) );
@@ -1044,11 +1037,7 @@ void instrumentTrack::saveTrackSpecificSettings( QDomDocument & _doc,
_this.setAttribute( "name", name() );
m_volumeKnob->saveSettings( _doc, _this, "vol" );
// make all coordinates positive
unsigned int x = surroundAreaPos().x() + 2 * SURROUND_AREA_SIZE;
unsigned int y = surroundAreaPos().y() + 2 * SURROUND_AREA_SIZE;
_this.setAttribute( "surpos", static_cast<unsigned int>( x & 0xFFFF ) +
( y * 256 * 256 ) );
m_surroundArea->saveSettings( _doc, _this, "surpos" );
_this.setAttribute( "fxch", m_effectChannelNumber->value() );
_this.setAttribute( "basetone", m_baseTone );
@@ -1076,9 +1065,7 @@ void instrumentTrack::loadTrackSpecificSettings( const QDomElement & _this )
setName( _this.attribute( "name" ) );
m_volumeKnob->loadSettings( _this, "vol" );
int i = _this.attribute( "surpos" ).toInt();
setSurroundAreaPos( QPoint( ( i & 0xFFFF ) - 2 * SURROUND_AREA_SIZE,
( i / ( 256 * 256 ) ) - 2 * SURROUND_AREA_SIZE) );
m_surroundArea->loadSettings( _this, "surpos" );
m_effectChannelNumber->setInitValue(
_this.attribute( "fxch" ).toInt() );