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

added fully-functional solo-button

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1066 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-06-03 16:03:31 +00:00
parent 7a5acc719b
commit df203dd51e
4 changed files with 90 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/track.h
View File

@@ -95,7 +95,7 @@ public:
return( m_length );
}
bool muted( void ) const
bool isMuted( void ) const
{
return( m_mutedModel.value() );
}
@@ -290,12 +290,6 @@ public:
trackOperationsWidget( trackView * _parent );
~trackOperationsWidget();
bool muted( void ) const;
public slots:
void setMuted( bool _muted );
protected:
virtual void mousePressEvent( QMouseEvent * _me );
@@ -307,11 +301,14 @@ private slots:
void disableAutomation( void );
void enableAutomation( void );
void removeTrack( void );
void toggleSolo( void );
void updateMenu( void );
private:
bbTrack * currentBBTrack( void );
bool inBBEditor( void );
static QPixmap * s_grip;
static QPixmap * s_muteOffDisabled;
static QPixmap * s_muteOffEnabled;
@@ -322,11 +319,10 @@ private:
QPushButton * m_trackOps;
pixmapButton * m_muteBtn;
pixmapButton * m_soloBtn;
bool m_automationDisabled;
bbTrack * currentBBTrack( void );
bool inBBEditor( void );
friend class trackView;
@@ -341,7 +337,7 @@ private:
class EXPORT track : public model, public journallingObject
{
Q_OBJECT
mapPropertyFromModel(bool,muted,setMuted,m_mutedModel);
mapPropertyFromModel(bool,isMuted,setMuted,m_mutedModel);
public:
enum TrackTypes
{
@@ -433,6 +429,8 @@ public slots:
m_name = _new_name;
}
void toggleSolo( void );
protected:
void sendMidiTime( const midiTime & _time );
@@ -443,7 +441,11 @@ private:
TrackTypes m_type;
QString m_name;
pixmapLoader * m_pixmapLoader;
boolModel m_mutedModel;
boolModel m_soloModel;
bool m_mutedBeforeSolo;
typedef QVector<trackContentObject *> tcoVector;
tcoVector m_trackContentObjects;

8
include/track_container.h
View File

@@ -39,6 +39,8 @@ class EXPORT trackContainer : public model, public journallingObject
{
Q_OBJECT
public:
typedef QList<track *> trackList;
trackContainer( void );
virtual ~trackContainer();
@@ -63,7 +65,7 @@ public:
void clearAllTracks( void );
const QList<track *> & tracks( void ) const
const trackList & tracks( void ) const
{
return( m_tracks );
}
@@ -79,11 +81,11 @@ signals:
private:
QList<track *> m_tracks;
trackList m_tracks;
friend class trackContainerView;
friend class track;
} ;