Skip to content

Commit 6f48244

Browse files
dcorson-ticino-comdcorson-ticino-com
authored
Merge branch 'master' into fix_1622_WhatsThis
2 parents dfaddf0 + f015f88 commit 6f48244

73 files changed

Lines changed: 1068 additions & 995 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/autobuild.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,15 @@ jobs:
134134

135135
runs-on: ${{ matrix.config.building_on_os }}
136136
steps:
137+
138+
# For Qt5 on Mac, we need to ensure SDK 10.15 is used, and not SDK 11.x
139+
# This is done by selecting Xcode 11.7 instead of the latest default of 12.x
140+
- name: Select Xcode version for Mac
141+
if: ${{ matrix.config.target_os == 'macos' }}
142+
uses: maxim-lobanov/setup-xcode@v1
143+
with:
144+
xcode-version: '11.7'
145+
137146
# Checkout code
138147
- name: Checkout code
139148
uses: actions/checkout@v2

‎README.md‎

Lines changed: 2 additions & 2 deletions

‎src/audiomixerboard.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,10 @@ CChannelFader::CChannelFader ( QWidget* pNW ) :
8686
pPan->setRange ( 0, AUD_MIX_PAN_MAX );
8787
pPan->setValue ( AUD_MIX_PAN_MAX / 2 );
8888
pPan->setNotchesVisible ( true );
89-
pInfoLabel->setMinimumHeight ( 15 ); // prevents jitter when muting/unmuting (#811)
90-
pPanInfoGrid->addWidget ( pPanLabel, 0, Qt::AlignLeft );
91-
pPanInfoGrid->addWidget ( pInfoLabel );
89+
pInfoLabel->setMinimumHeight ( pPanLabel->height() ); // prevents jitter when muting/unmuting (#811)
90+
pInfoLabel->setAlignment ( Qt::AlignTop );
91+
pPanInfoGrid->addWidget ( pPanLabel, 0, Qt::AlignLeft | Qt::AlignTop );
92+
pPanInfoGrid->addWidget ( pInfoLabel, 0, Qt::AlignHCenter | Qt::AlignTop );
9293
pPanGrid->addLayout ( pPanInfoGrid );
9394
pPanGrid->addWidget ( pPan, 0, Qt::AlignHCenter );
9495

‎src/clientsettingsdlg.cpp‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,12 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP,
371371
ledOverallDelay->Reset();
372372
ledNetw->SetType ( CMultiColorLED::MT_INDICATOR );
373373
ledOverallDelay->SetType ( CMultiColorLED::MT_INDICATOR );
374+
lblUpstreamValue->setText ( "---" );
375+
lblUpstreamUnit->setText ( "" );
374376
lblPingTimeValue->setText ( "---" );
377+
lblPingTimeUnit->setText ( "" );
375378
lblOverallDelayValue->setText ( "---" );
376-
lblUpstreamValue->setText ( "---" );
379+
lblOverallDelayUnit->setText ( "" );
377380
edtNewClientLevel->setValidator ( new QIntValidator ( 0, 100, this ) ); // % range from 0-100
378381

379382

@@ -994,14 +997,17 @@ void CClientSettingsDlg::SetPingTimeResult ( const int i
994997
}
995998
else
996999
{
997-
lblPingTimeValue->setText ( QString().setNum ( iPingTime ) + " ms" );
998-
lblOverallDelayValue->setText ( QString().setNum ( iOverallDelayMs ) + " ms" );
1000+
lblPingTimeValue->setText ( QString().setNum ( iPingTime ) );
1001+
lblPingTimeUnit->setText ( "ms" );
1002+
lblOverallDelayValue->setText ( QString().setNum ( iOverallDelayMs ) );
1003+
lblOverallDelayUnit->setText ( "ms" );
9991004
}
10001005

10011006
// update upstream rate information label (note that we update this together
10021007
// with the ping time since the network packet sequence number feature might
10031008
// be enabled at any time which has influence on the upstream rate)
1004-
lblUpstreamValue->setText ( QString().setNum ( pClient->GetUploadRateKbps() ) + " kbps" );
1009+
lblUpstreamValue->setText ( QString().setNum ( pClient->GetUploadRateKbps() ) );
1010+
lblUpstreamUnit->setText ( "kbps" );
10051011

10061012
// set current LED status
10071013
ledOverallDelay->SetLight ( eOverallDelayLEDColor );
@@ -1017,8 +1023,11 @@ void CClientSettingsDlg::UpdateDisplay()
10171023
{
10181024
// clear text labels with client parameters
10191025
lblPingTimeValue->setText ( "---" );
1026+
lblPingTimeUnit->setText ( "" );
10201027
lblOverallDelayValue->setText ( "---" );
1028+
lblOverallDelayUnit->setText ( "" );
10211029
lblUpstreamValue->setText ( "---" );
1030+
lblUpstreamUnit->setText ( "" );
10221031
}
10231032
}
10241033

‎src/clientsettingsdlgbase.ui‎

Lines changed: 112 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>414</width>
9+
<width>436</width>
1010
<height>524</height>
1111
</rect>
1212
</property>
@@ -855,128 +855,130 @@
855855
<number>2</number>
856856
</property>
857857
<item>
858-
<layout class="QHBoxLayout" name="_10">
859-
<item>
858+
<layout class="QGridLayout" name="_10">
859+
<item row="0" column="0">
860860
<widget class="QLabel" name="lblUpstream">
861861
<property name="text">
862862
<string>Audio Stream Rate</string>
863863
</property>
864+
<property name="alignment">
865+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
866+
</property>
864867
</widget>
865868
</item>
866-
<item>
869+
<item row="0" column="1">
867870
<widget class="QLabel" name="lblUpstreamValue">
868-
<property name="minimumSize">
869-
<size>
870-
<width>0</width>
871-
<height>20</height>
872-
</size>
873-
</property>
874871
<property name="text">
875872
<string>val</string>
876873
</property>
874+
<property name="alignment">
875+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
876+
</property>
877+
<property name="margin">
878+
<number>2</number>
879+
</property>
877880
</widget>
878881
</item>
879-
</layout>
880-
</item>
881-
<item>
882-
<layout class="QHBoxLayout" name="_11">
883-
<item>
882+
<item row="0" column="2" colspan="2">
883+
<widget class="QLabel" name="lblUpstreamUnit">
884+
<property name="text">
885+
<string>kbps</string>
886+
</property>
887+
<property name="alignment">
888+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
889+
</property>
890+
</widget>
891+
</item>
892+
<item row="1" column="0">
884893
<widget class="QLabel" name="lblPingTime">
885894
<property name="text">
886895
<string>Ping Time</string>
887896
</property>
888897
</widget>
889898
</item>
890-
<item>
899+
<item row="1" column="1">
891900
<widget class="QLabel" name="lblPingTimeValue">
892-
<property name="sizePolicy">
893-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
894-
<horstretch>0</horstretch>
895-
<verstretch>0</verstretch>
896-
</sizepolicy>
901+
<property name="text">
902+
<string>val</string>
897903
</property>
898-
<property name="minimumSize">
899-
<size>
900-
<width>0</width>
901-
<height>20</height>
902-
</size>
904+
<property name="alignment">
905+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
903906
</property>
907+
<property name="margin">
908+
<number>2</number>
909+
</property>
910+
</widget>
911+
</item>
912+
<item row="1" column="2">
913+
<widget class="QLabel" name="lblPingTimeUnit">
904914
<property name="text">
905-
<string>val</string>
915+
<string>ms</string>
916+
</property>
917+
<property name="alignment">
918+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
906919
</property>
907920
</widget>
908921
</item>
909-
</layout>
910-
</item>
911-
<item>
912-
<layout class="QHBoxLayout" name="_12">
913-
<item>
922+
<item row="2" column="0">
914923
<widget class="QLabel" name="lblOverallDelay">
915924
<property name="text">
916925
<string>Overall Delay</string>
917926
</property>
918927
</widget>
919928
</item>
920-
<item>
921-
<layout class="QHBoxLayout" name="_13">
922-
<property name="spacing">
923-
<number>3</number>
929+
<item row="2" column="1">
930+
<widget class="QLabel" name="lblOverallDelayValue">
931+
<property name="text">
932+
<string>val</string>
924933
</property>
925-
<item>
926-
<widget class="QLabel" name="lblOverallDelayValue">
927-
<property name="sizePolicy">
928-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
929-
<horstretch>0</horstretch>
930-
<verstretch>0</verstretch>
931-
</sizepolicy>
932-
</property>
933-
<property name="minimumSize">
934-
<size>
935-
<width>0</width>
936-
<height>20</height>
937-
</size>
938-
</property>
939-
<property name="text">
940-
<string>val</string>
941-
</property>
942-
</widget>
943-
</item>
944-
<item>
945-
<widget class="CMultiColorLED" name="ledOverallDelay" native="true">
946-
<property name="sizePolicy">
947-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
948-
<horstretch>0</horstretch>
949-
<verstretch>0</verstretch>
950-
</sizepolicy>
951-
</property>
952-
<property name="minimumSize">
953-
<size>
954-
<width>20</width>
955-
<height>20</height>
956-
</size>
957-
</property>
958-
<property name="maximumSize">
959-
<size>
960-
<width>20</width>
961-
<height>20</height>
962-
</size>
963-
</property>
964-
</widget>
965-
</item>
966-
</layout>
934+
<property name="alignment">
935+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
936+
</property>
937+
<property name="margin">
938+
<number>2</number>
939+
</property>
940+
</widget>
967941
</item>
968-
</layout>
969-
</item>
970-
<item>
971-
<layout class="QHBoxLayout" name="_14">
972-
<item>
942+
<item row="2" column="2">
943+
<widget class="QLabel" name="lblOverallDelayUnit">
944+
<property name="text">
945+
<string>ms</string>
946+
</property>
947+
<property name="alignment">
948+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
949+
</property>
950+
</widget>
951+
</item>
952+
<item row="2" column="3">
953+
<widget class="CMultiColorLED" name="ledOverallDelay" native="true">
954+
<property name="sizePolicy">
955+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
956+
<horstretch>0</horstretch>
957+
<verstretch>0</verstretch>
958+
</sizepolicy>
959+
</property>
960+
<property name="minimumSize">
961+
<size>
962+
<width>20</width>
963+
<height>20</height>
964+
</size>
965+
</property>
966+
<property name="maximumSize">
967+
<size>
968+
<width>20</width>
969+
<height>20</height>
970+
</size>
971+
</property>
972+
</widget>
973+
</item>
974+
<item row="3" column="0" colspan="3">
973975
<widget class="QLabel" name="lblNetLEDLabel">
974976
<property name="text">
975977
<string>Local Jitter Buffer</string>
976978
</property>
977979
</widget>
978980
</item>
979-
<item>
981+
<item row="3" column="3">
980982
<widget class="CMultiColorLED" name="ledNetw" native="true">
981983
<property name="sizePolicy">
982984
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -1378,8 +1380,34 @@
13781380
</customwidget>
13791381
</customwidgets>
13801382
<tabstops>
1383+
<tabstop>pedtAlias</tabstop>
1384+
<tabstop>pcbxInstrument</tabstop>
1385+
<tabstop>pcbxCountry</tabstop>
1386+
<tabstop>pedtCity</tabstop>
1387+
<tabstop>pcbxSkill</tabstop>
1388+
<tabstop>cbxSkin</tabstop>
1389+
<tabstop>cbxLanguage</tabstop>
1390+
<tabstop>spnMixerRows</tabstop>
1391+
<tabstop>cbxSoundcard</tabstop>
1392+
<tabstop>butDriverSetup</tabstop>
1393+
<tabstop>cbxLInChan</tabstop>
1394+
<tabstop>cbxRInChan</tabstop>
1395+
<tabstop>cbxLOutChan</tabstop>
1396+
<tabstop>cbxROutChan</tabstop>
13811397
<tabstop>cbxAudioChannels</tabstop>
13821398
<tabstop>cbxAudioQuality</tabstop>
1399+
<tabstop>rbtBufferDelayPreferred</tabstop>
1400+
<tabstop>rbtBufferDelayDefault</tabstop>
1401+
<tabstop>rbtBufferDelaySafe</tabstop>
1402+
<tabstop>chbAutoJitBuf</tabstop>
1403+
<tabstop>sldNetBuf</tabstop>
1404+
<tabstop>sldNetBufServer</tabstop>
1405+
<tabstop>chbEnableOPUS64</tabstop>
1406+
<tabstop>cbxCentralServerAddress</tabstop>
1407+
<tabstop>edtNewClientLevel</tabstop>
1408+
<tabstop>cbxInputBoost</tabstop>
1409+
<tabstop>chbDetectFeedback</tabstop>
1410+
<tabstop>sldAudioPan</tabstop>
13831411
</tabstops>
13841412
<resources>
13851413
<include location="resources.qrc"/>

‎src/main.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,9 @@ int main ( int argc, char** argv )
856856
// only start application without using the GUI
857857
qInfo() << qUtf8Printable( GetVersionAndNameStr ( false ) );
858858

859+
// enable server list if a directory server is defined
860+
Server.SetServerListEnabled ( !strCentralServer.isEmpty() );
861+
859862
// update serverlist
860863
Server.UpdateServerList();
861864

‎src/res/homepage/ES/audiochannels.png‎

-1.13 KB
Binary file not shown.

‎src/res/homepage/ES/audiofader.png‎

-8.27 KB
Binary file not shown.

‎src/res/homepage/ES/audioquality.png‎

-998 Bytes
Binary file not shown.

‎src/res/homepage/ES/bufferdelay.png‎

-2.55 KB
Binary file not shown.

0 commit comments

Comments
 (0)