eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

prepare for pull request: #356

Browse source
This commit is contained in:
Volker Fischer 2020-06-13 08:31:28 +02:00
parent e1b982c34c
commit e4b01fa395
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/audiomixerboard.cpp
View file

@ -314,7 +314,7 @@ void CChannelFader::Reset()
plblInstrument->setToolTip ( "" ); plblInstrument->setToolTip ( "" );
plblCountryFlag->setVisible ( false ); plblCountryFlag->setVisible ( false );
plblCountryFlag->setToolTip ( "" ); plblCountryFlag->setToolTip ( "" );
strReceivedName = ""; cReceivedChanInfo = CChannelInfo();
SetupFaderTag ( SL_NOT_SET ); SetupFaderTag ( SL_NOT_SET );
// set a defined tool tip time out // set a defined tool tip time out
@ -438,15 +438,15 @@ void CChannelFader::SetChannelLevel ( const uint16_t iLevel )
void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo ) void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo )
{ {
// store received channel info
cReceivedChanInfo = cChanInfo;
// init properties for the tool tip // init properties for the tool tip
int iTTInstrument = CInstPictures::GetNotUsedInstrument(); int iTTInstrument = CInstPictures::GetNotUsedInstrument();
QLocale::Country eTTCountry = QLocale::AnyCountry; QLocale::Country eTTCountry = QLocale::AnyCountry;
// Label text -------------------------------------------------------------- // Label text --------------------------------------------------------------
// store original received name
strReceivedName = cChanInfo.strName;
// break text at predefined position // break text at predefined position
const int iBreakPos = MAX_LEN_FADER_TAG / 2; const int iBreakPos = MAX_LEN_FADER_TAG / 2;
@ -521,9 +521,9 @@ void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo )
QString strToolTip = ""; QString strToolTip = "";
// alias/name // alias/name
if ( !strReceivedName.isEmpty() ) if ( !cChanInfo.strName.isEmpty() )
{ {
strToolTip += "<h4>" + tr ( "Alias/Name" ) + "</h4>" + strReceivedName; strToolTip += "<h4>" + tr ( "Alias/Name" ) + "</h4>" + cChanInfo.strName;
} }
// instrument // instrument

5
src/audiomixerboard.h
View file

@ -49,7 +49,8 @@ class CChannelFader : public QObject
public: public:
CChannelFader ( QWidget* pNW ); CChannelFader ( QWidget* pNW );
QString GetReceivedName() { return strReceivedName; } QString GetReceivedName() { return cReceivedChanInfo.strName; }
int GetReceivedInstrument() { return cReceivedChanInfo.iInstrument; }
void SetChannelInfos ( const CChannelInfo& cChanInfo ); void SetChannelInfos ( const CChannelInfo& cChanInfo );
void Show() { pFrame->show(); } void Show() { pFrame->show(); }
void Hide() { pFrame->hide(); } void Hide() { pFrame->hide(); }
@ -101,7 +102,7 @@ protected:
QLabel* plblInstrument; QLabel* plblInstrument;
QLabel* plblCountryFlag; QLabel* plblCountryFlag;
QString strReceivedName; CChannelInfo cReceivedChanInfo;
bool bOtherChannelIsSolo; bool bOtherChannelIsSolo;
bool bIsMyOwnFader; bool bIsMyOwnFader;