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

GUI improvements

Browse source
This commit is contained in:
Volker Fischer 2006-10-04 18:05:33 +00:00
parent 50eba66c0c
commit bf365ce0bc
3 changed files with 39 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/global.h
View file

@ -42,7 +42,7 @@
/* version and application name (always use this version) */ /* version and application name (always use this version) */
#undef VERSION #undef VERSION
#define VERSION "0.9.6cvs" #define VERSION "0.9.7cvs"
#define APP_NAME "llcon" #define APP_NAME "llcon"
@ -68,7 +68,7 @@
#define NET_BLOCK_SIZE_FACTOR 3 // 3 * 2 ms = 6 ms #define NET_BLOCK_SIZE_FACTOR 3 // 3 * 2 ms = 6 ms
// maximum value of factor for network block size // maximum value of factor for network block size
#define NET_BLOCK_SIZE_FACTOR_MAX 15 #define NET_BLOCK_SIZE_FACTOR_MAX 8
/* maximum network buffer size (which can be chosen by slider) */ /* maximum network buffer size (which can be chosen by slider) */
#define MAX_NET_BUF_SIZE_NUM_BL 10 /* number of blocks */ #define MAX_NET_BUF_SIZE_NUM_BL 10 /* number of blocks */

8
src/llconclientdlg.cpp
View file

@ -102,7 +102,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
SliderNetBufSiFactIn->setRange(1, NET_BLOCK_SIZE_FACTOR_MAX); SliderNetBufSiFactIn->setRange(1, NET_BLOCK_SIZE_FACTOR_MAX);
const int iCurNetBufSiFactIn = pClient->GetNetwBufSizeFactIn(); const int iCurNetBufSiFactIn = pClient->GetNetwBufSizeFactIn();
SliderNetBufSiFactIn->setValue(iCurNetBufSiFactIn); SliderNetBufSiFactIn->setValue(iCurNetBufSiFactIn);
TextNetBufSiFactIn->setText("In: " + QString().setNum( TextNetBufSiFactIn->setText("In:\n" + QString().setNum(
double(iCurNetBufSiFactIn * MIN_BLOCK_DURATION_MS), 'f', 2) + double(iCurNetBufSiFactIn * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms"); " ms");
@ -110,7 +110,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
SliderNetBufSiFactOut->setRange(1, NET_BLOCK_SIZE_FACTOR_MAX); SliderNetBufSiFactOut->setRange(1, NET_BLOCK_SIZE_FACTOR_MAX);
const int iCurNetBufSiFactOut = pClient->GetNetwBufSizeFactOut(); const int iCurNetBufSiFactOut = pClient->GetNetwBufSizeFactOut();
SliderNetBufSiFactOut->setValue(iCurNetBufSiFactOut); SliderNetBufSiFactOut->setValue(iCurNetBufSiFactOut);
TextNetBufSiFactOut->setText("Out: " + QString().setNum( TextNetBufSiFactOut->setText("Out:\n" + QString().setNum(
double(iCurNetBufSiFactOut * MIN_BLOCK_DURATION_MS), 'f', 2) + double(iCurNetBufSiFactOut * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms"); " ms");
@ -272,7 +272,7 @@ void CLlconClientDlg::OnSliderNetBuf(int value)
void CLlconClientDlg::OnSliderNetBufSiFactIn(int value) void CLlconClientDlg::OnSliderNetBufSiFactIn(int value)
{ {
pClient->SetNetwBufSizeFactIn ( value ); pClient->SetNetwBufSizeFactIn ( value );
TextNetBufSiFactIn->setText("In: " + QString().setNum( TextNetBufSiFactIn->setText("In:\n" + QString().setNum(
double(value * MIN_BLOCK_DURATION_MS), 'f', 2) + double(value * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms"); " ms");
UpdateDisplay(); UpdateDisplay();
@ -281,7 +281,7 @@ void CLlconClientDlg::OnSliderNetBufSiFactIn(int value)
void CLlconClientDlg::OnSliderNetBufSiFactOut(int value) void CLlconClientDlg::OnSliderNetBufSiFactOut(int value)
{ {
pClient->SetNetwBufSizeFactOut ( value ); pClient->SetNetwBufSizeFactOut ( value );
TextNetBufSiFactOut->setText("Out: " + QString().setNum( TextNetBufSiFactOut->setText("Out:\n" + QString().setNum(
double(value * MIN_BLOCK_DURATION_MS), 'f', 2) + double(value * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms"); " ms");
UpdateDisplay(); UpdateDisplay();

53
src/llconclientdlgbase.ui
View file

@ -11,7 +11,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>927</width> <width>776</width>
<height>287</height> <height>287</height>
</rect> </rect>
</property> </property>
@ -452,7 +452,8 @@
</property> </property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>Audio Fader</string> <string>Audio
Fader</string>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>alignment</name> <name>alignment</name>
@ -506,7 +507,8 @@
</property> </property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>Reverb</string> <string>Reverb
Level</string>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>alignment</name> <name>alignment</name>
@ -547,7 +549,8 @@
</property> </property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>Reverb Selection</string> <string>Reverb Chan.
Selection</string>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>alignment</name> <name>alignment</name>
@ -623,6 +626,13 @@
<name>name</name> <name>name</name>
<cstring>TextNetBuf</cstring> <cstring>TextNetBuf</cstring>
</property> </property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>Size</string> <string>Size</string>
@ -761,7 +771,7 @@
<property stdset="1"> <property stdset="1">
<name>minimumSize</name> <name>minimumSize</name>
<size> <size>
<width>85</width> <width>50</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -802,13 +812,6 @@
<name>name</name> <name>name</name>
<cstring>TextNetBufSiFactOut</cstring> <cstring>TextNetBufSiFactOut</cstring>
</property> </property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
<string>Size</string> <string>Size</string>
@ -1135,16 +1138,9 @@
<name>name</name> <name>name</name>
<cstring>GroupBoxMeasureResults</cstring> <cstring>GroupBoxMeasureResults</cstring>
</property> </property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>152</width>
<height>0</height>
</size>
</property>
<property stdset="1"> <property stdset="1">
<name>title</name> <name>title</name>
<string>Measurement Results</string> <string>Debug</string>
</property> </property>
<vbox> <vbox>
<property stdset="1"> <property stdset="1">
@ -1155,21 +1151,6 @@
<name>spacing</name> <name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout17</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget> <widget>
<class>QLabel</class> <class>QLabel</class>
<property stdset="1"> <property stdset="1">
@ -1192,8 +1173,6 @@
<string>val</string> <string>val</string>
</property> </property>
</widget> </widget>
</hbox>
</widget>
</vbox> </vbox>
</widget> </widget>
</hbox> </hbox>