diff --git a/src/global.h b/src/global.h
index 93a0d613..68c524d4 100755
--- a/src/global.h
+++ b/src/global.h
@@ -42,7 +42,7 @@
/* version and application name (always use this version) */
#undef VERSION
-#define VERSION "0.9.6cvs"
+#define VERSION "0.9.7cvs"
#define APP_NAME "llcon"
@@ -68,7 +68,7 @@
#define NET_BLOCK_SIZE_FACTOR 3 // 3 * 2 ms = 6 ms
// 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) */
#define MAX_NET_BUF_SIZE_NUM_BL 10 /* number of blocks */
diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp
index 8bd75ce6..fae08e30 100755
--- a/src/llconclientdlg.cpp
+++ b/src/llconclientdlg.cpp
@@ -102,7 +102,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
SliderNetBufSiFactIn->setRange(1, NET_BLOCK_SIZE_FACTOR_MAX);
const int iCurNetBufSiFactIn = pClient->GetNetwBufSizeFactIn();
SliderNetBufSiFactIn->setValue(iCurNetBufSiFactIn);
- TextNetBufSiFactIn->setText("In: " + QString().setNum(
+ TextNetBufSiFactIn->setText("In:\n" + QString().setNum(
double(iCurNetBufSiFactIn * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
@@ -110,7 +110,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
SliderNetBufSiFactOut->setRange(1, NET_BLOCK_SIZE_FACTOR_MAX);
const int iCurNetBufSiFactOut = pClient->GetNetwBufSizeFactOut();
SliderNetBufSiFactOut->setValue(iCurNetBufSiFactOut);
- TextNetBufSiFactOut->setText("Out: " + QString().setNum(
+ TextNetBufSiFactOut->setText("Out:\n" + QString().setNum(
double(iCurNetBufSiFactOut * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
@@ -272,7 +272,7 @@ void CLlconClientDlg::OnSliderNetBuf(int value)
void CLlconClientDlg::OnSliderNetBufSiFactIn(int value)
{
pClient->SetNetwBufSizeFactIn ( value );
- TextNetBufSiFactIn->setText("In: " + QString().setNum(
+ TextNetBufSiFactIn->setText("In:\n" + QString().setNum(
double(value * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
UpdateDisplay();
@@ -281,7 +281,7 @@ void CLlconClientDlg::OnSliderNetBufSiFactIn(int value)
void CLlconClientDlg::OnSliderNetBufSiFactOut(int value)
{
pClient->SetNetwBufSizeFactOut ( value );
- TextNetBufSiFactOut->setText("Out: " + QString().setNum(
+ TextNetBufSiFactOut->setText("Out:\n" + QString().setNum(
double(value * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
UpdateDisplay();
diff --git a/src/llconclientdlgbase.ui b/src/llconclientdlgbase.ui
index e5bdadfd..bc254076 100755
--- a/src/llconclientdlgbase.ui
+++ b/src/llconclientdlgbase.ui
@@ -11,7 +11,7 @@
0
0
- 927
+ 776
287
@@ -452,7 +452,8 @@
text
- Audio Fader
+ Audio
+Fader
alignment
@@ -506,7 +507,8 @@
text
- Reverb
+ Reverb
+Level
alignment
@@ -547,7 +549,8 @@
text
- Reverb Selection
+ Reverb Chan.
+Selection
alignment
@@ -623,6 +626,13 @@
name
TextNetBuf
+
+ minimumSize
+
+ 50
+ 0
+
+
text
Size
@@ -761,7 +771,7 @@
minimumSize
- 85
+ 50
0
@@ -802,13 +812,6 @@
name
TextNetBufSiFactOut
-
- minimumSize
-
- 0
- 0
-
-
text
Size
@@ -1135,16 +1138,9 @@
name
GroupBoxMeasureResults
-
- minimumSize
-
- 152
- 0
-
-
title
- Measurement Results
+ Debug
@@ -1156,43 +1152,26 @@
6
- QLayoutWidget
+ QLabel
name
- Layout17
+ TextLabelStdDevTimerLabel
+
+
+ text
+ StdDev:
+
+
+
+ QLabel
+
+ name
+ TextLabelStdDevTimer
+
+
+ text
+ val
-
-
- margin
- 0
-
-
- spacing
- 6
-
-
- QLabel
-
- name
- TextLabelStdDevTimerLabel
-
-
- text
- StdDev:
-
-
-
- QLabel
-
- name
- TextLabelStdDevTimer
-
-
- text
- val
-
-
-