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

first QT4 version which can be compiled and linked without errors on Windows

Browse source
This commit is contained in:
Volker Fischer 2008-01-17 18:56:43 +00:00
parent 8b0389c192
commit fa759cefdf
16 changed files with 2773 additions and 1931 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

300
src/aboutdlgbase.ui
View file

@ -1,281 +1,207 @@
<!DOCTYPE UI><UI> <ui version="4.0" >
<class>CAboutDlgBase</class> <class>CAboutDlgBase</class>
<widget> <widget class="QDialog" name="CAboutDlgBase" >
<class>QDialog</class> <property name="geometry" >
<property stdset="1">
<name>name</name>
<cstring>CAboutDlgBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>546</width> <width>541</width>
<height>423</height> <height>357</height>
</rect> </rect>
</property> </property>
<property stdset="1"> <property name="sizePolicy" >
<name>sizePolicy</name>
<sizepolicy> <sizepolicy>
<hsizetype>1</hsizetype> <hsizetype>1</hsizetype>
<vsizetype>1</vsizetype> <vsizetype>1</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property stdset="1"> <property name="windowTitle" >
<name>caption</name>
<string>About llcon</string> <string>About llcon</string>
</property> </property>
<property stdset="1"> <property name="windowIcon" >
<name>icon</name> <iconset/>
<pixmap>image0</pixmap>
</property> </property>
<property stdset="1"> <property name="sizeGripEnabled" >
<name>sizeGripEnabled</name>
<bool>true</bool> <bool>true</bool>
</property> </property>
<property> <layout class="QVBoxLayout" >
<name>layoutMargin</name> <property name="margin" >
<number>9</number>
</property> </property>
<property> <property name="spacing" >
<name>layoutSpacing</name>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<widget> <item>
<class>QLayoutWidget</class> <layout class="QHBoxLayout" >
<property stdset="1"> <property name="margin" >
<name>name</name>
<cstring>Layout21</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number> <number>0</number>
</property> </property>
<property stdset="1"> <property name="spacing" >
<name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<widget> <item>
<class>QLabel</class> <widget class="QLabel" name="PixmapLabelDreamLogo" >
<property stdset="1"> <property name="sizePolicy" >
<name>name</name>
<cstring>PixmapLabelDreamLogo</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy> <sizepolicy>
<hsizetype>0</hsizetype> <hsizetype>0</hsizetype>
<vsizetype>0</vsizetype> <vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property stdset="1"> <property name="pixmap" >
<name>pixmap</name> <pixmap/>
<pixmap>image1</pixmap>
</property> </property>
<property stdset="1"> <property name="scaledContents" >
<name>scaledContents</name>
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> <property name="wordWrap" >
<widget> <bool>false</bool>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabelVersion</cstring>
</property> </property>
<property stdset="1"> </widget>
<name>sizePolicy</name> </item>
<item>
<widget class="QLabel" name="TextLabelVersion" >
<property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>7</hsizetype> <hsizetype>7</hsizetype>
<vsizetype>5</vsizetype> <vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property stdset="1"> <property name="text" >
<name>text</name>
<string>TextLabelVersion</string> <string>TextLabelVersion</string>
</property> </property>
<property stdset="1"> <property name="alignment" >
<name>alignment</name> <set>Qt::AlignCenter</set>
<set>AlignCenter</set>
</property> </property>
<property> <property name="wordWrap" >
<name>hAlign</name> <bool>false</bool>
</property> </property>
</widget> </widget>
</hbox> </item>
</widget> </layout>
<widget> </item>
<class>QLayoutWidget</class> <item>
<property stdset="1"> <layout class="QHBoxLayout" >
<name>name</name> <property name="margin" >
<cstring>Layout8</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number> <number>0</number>
</property> </property>
<property stdset="1"> <property name="spacing" >
<name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<widget> <item>
<class>QLayoutWidget</class> <layout class="QVBoxLayout" >
<property stdset="1"> <property name="margin" >
<name>name</name>
<cstring>Layout16</cstring>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>0</number> <number>0</number>
</property> </property>
<property stdset="1"> <property name="spacing" >
<name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<widget> <item>
<class>QLabel</class> <widget class="QLabel" name="TextLabelAuthorNames" >
<property stdset="1"> <property name="text" >
<name>name</name>
<cstring>TextLabelAuthorNames</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Author: Volker Fischer</string> <string>Author: Volker Fischer</string>
</property> </property>
</widget> <property name="wordWrap" >
<widget> <bool>false</bool>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabelCopyright</cstring>
</property> </property>
<property stdset="1"> </widget>
<name>text</name> </item>
<item>
<widget class="QLabel" name="TextLabelCopyright" >
<property name="text" >
<string>Copyright (C) 2005 - 2006</string> <string>Copyright (C) 2005 - 2006</string>
</property> </property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget> </widget>
</vbox> </item>
</widget> </layout>
</item>
<item>
<spacer> <spacer>
<property> <property name="orientation" >
<name>name</name> <enum>Qt::Horizontal</enum>
<cstring>Spacer10</cstring>
</property> </property>
<property> <property name="sizeType" >
<name>orientation</name> <enum>QSizePolicy::Expanding</enum>
<enum>Horizontal</enum>
</property> </property>
<property> <property name="sizeHint" >
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</hbox> </item>
</widget> </layout>
<widget> </item>
<class>QTextView</class> <item>
<property stdset="1"> <widget class="QTextBrowser" name="TextViewCredits" />
<name>name</name> </item>
<cstring>TextViewCredits</cstring> <item>
</property> <layout class="QHBoxLayout" >
<property stdset="1"> <property name="margin" >
<name>text</name>
<string>TextViewCredits</string>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout6</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number> <number>0</number>
</property> </property>
<property stdset="1"> <property name="spacing" >
<name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<item>
<spacer> <spacer>
<property> <property name="orientation" >
<name>name</name> <enum>Qt::Horizontal</enum>
<cstring>Spacer12</cstring>
</property> </property>
<property> <property name="sizeType" >
<name>orientation</name> <enum>QSizePolicy::Expanding</enum>
<enum>Horizontal</enum>
</property> </property>
<property> <property name="sizeHint" >
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget> </item>
<class>QPushButton</class> <item>
<property stdset="1"> <widget class="QPushButton" name="buttonOk" >
<name>name</name> <property name="text" >
<cstring>buttonOk</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;OK</string> <string>&amp;OK</string>
</property> </property>
<property stdset="1"> <property name="autoDefault" >
<name>autoDefault</name>
<bool>true</bool> <bool>true</bool>
</property> </property>
<property stdset="1"> <property name="default" >
<name>default</name>
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</hbox> </item>
</layout>
</item>
</layout>
</widget> </widget>
</vbox> <resources/>
</widget>
<images>
<image>
<name>image0</name>
<data format="XPM.GZ" length="427">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2ea5248564056503300071f5205c0b2004719541dcb434986c22840b0260c56800454c9918b1c444e54454b1c4c4a424e5a4c4442431a0085008081231c4949511621021656565b042843a908032bade24a832547b21c6a1ba0f08d0fda18ccd6fd8c2009f58ad351700407358e1</data>
</image>
<image>
<name>image1</name>
<data format="XPM.GZ" length="427">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2ea5248564056503300071f5205c0b2004719541dcb434986c22840b0260c56800454c9918b1c444e54454b1c4c4a424e5a4c4442431a0085008081231c4949511621021656565b042843a908032bade24a832547b21c6a1ba0f08d0fda18ccd6fd8c2009f58ad351700407358e1</data>
</image>
</images>
<connections> <connections>
<connection> <connection>
<sender>buttonOk</sender> <sender>buttonOk</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>CAboutDlgBase</receiver> <receiver>CAboutDlgBase</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection> </connection>
</connections> </connections>
</UI> </ui>

21
src/client.cpp
View file

@ -91,23 +91,18 @@ bool CClient::SetServerAddr ( QString strNAddr )
// first try if this is an IP number an can directly applied to QHostAddress // first try if this is an IP number an can directly applied to QHostAddress
if ( !InetAddr.setAddress ( strNAddr ) ) if ( !InetAddr.setAddress ( strNAddr ) )
{ {
// TODO implement the IP number query with QT objects (this is not possible with
// QT 2 so we have to implement a workaround solution here
// it was no vaild IP address, try to get host by name, assuming // it was no vaild IP address, try to get host by name, assuming
// that the string contains a valid host name string // that the string contains a valid host name string
const hostent* HostInf = gethostbyname ( strNAddr.toLatin1() ); QHostInfo HostInfo = QHostInfo::fromName ( strNAddr );
if ( HostInf ) if ( HostInfo.error() == QHostInfo::NoError )
{ {
uint32_t dwIPNumber; // apply IP address to QT object
if ( !HostInfo.addresses().isEmpty() )
// copy IP address of first found host in host list {
memcpy ( (char*) &dwIPNumber, HostInf->h_addr_list[0], sizeof ( dwIPNumber ) ); // use the first IP address
InetAddr = HostInfo.addresses().first();
// apply IP address to QT object (change byte order, too) }
InetAddr.setAddress ( htonl ( dwIPNumber ) );
} }
else else
{ {

1
src/client.h
View file

@ -27,6 +27,7 @@
#include <qthread.h> #include <qthread.h>
#include <qhostaddress.h> #include <qhostaddress.h>
#include <qhostinfo.h>
#include <qstring.h> #include <qstring.h>
#include <qdatetime.h> #include <qdatetime.h>
#include "global.h" #include "global.h"

2
src/clientsettingsdlg.cpp
View file

@ -29,6 +29,8 @@
CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
Qt::WindowFlags f ) : pClient ( pNCliP ), QDialog ( parent, f ) Qt::WindowFlags f ) : pClient ( pNCliP ), QDialog ( parent, f )
{ {
setupUi ( this );
/* Init timing jitter text label */ /* Init timing jitter text label */
TextLabelStdDevTimer->setText ( "" ); TextLabelStdDevTimer->setText ( "" );

1057
src/clientsettingsdlgbase.ui
View file

File diff suppressed because it is too large Load diff

2
src/llconclientdlg.cpp
View file

@ -141,7 +141,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent )
// TODO check if code works and then clean up!!!!!!! // TODO check if code works and then clean up!!!!!!!
// TODO QT4
#if 0 #if 0
/* Settings menu ------------------------------------------------------- */ /* Settings menu ------------------------------------------------------- */

893
src/llconclientdlgbase.ui
View file

File diff suppressed because one or more lines are too long

6
src/llconserverdlg.cpp
View file

@ -43,6 +43,9 @@ CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent )
// set up list view for connected clients // set up list view for connected clients
ListViewClients->setColumnWidth ( 0, 170 ); ListViewClients->setColumnWidth ( 0, 170 );
// TODO QT4
// ListViewClients->setColumnAlignment ( 1, Qt::AlignLeft ); // ListViewClients->setColumnAlignment ( 1, Qt::AlignLeft );
ListViewClients->setColumnWidth ( 1, 150 ); ListViewClients->setColumnWidth ( 1, 150 );
// ListViewClients->setColumnAlignment ( 2, Qt::AlignCenter ); // ListViewClients->setColumnAlignment ( 2, Qt::AlignCenter );
@ -68,6 +71,9 @@ CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent )
/* Main menu bar -------------------------------------------------------- */ /* Main menu bar -------------------------------------------------------- */
// TODO QT4
pMenu = new QMenuBar ( this ); pMenu = new QMenuBar ( this );
// pMenu->insertItem ( tr ( "&?" ), new CLlconHelpMenu ( this ) ); // pMenu->insertItem ( tr ( "&?" ), new CLlconHelpMenu ( this ) );
pMenu->addMenu ( new CLlconHelpMenu ( this ) ); pMenu->addMenu ( new CLlconHelpMenu ( this ) );

237
src/llconserverdlgbase.ui
View file

@ -1,197 +1,176 @@
<!DOCTYPE UI><UI> <ui version="4.0" >
<class>CLlconServerDlgBase</class> <class>CLlconServerDlgBase</class>
<widget> <widget class="QDialog" name="CLlconServerDlgBase" >
<class>QDialog</class> <property name="geometry" >
<property stdset="1">
<name>name</name>
<cstring>CLlconServerDlgBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>752</width> <width>699</width>
<height>239</height> <height>291</height>
</rect> </rect>
</property> </property>
<property stdset="1"> <property name="windowTitle" >
<name>caption</name>
<string>llcon</string> <string>llcon</string>
</property> </property>
<property stdset="1"> <property name="windowIcon" >
<name>icon</name> <iconset/>
<pixmap>image0</pixmap>
</property> </property>
<property stdset="1"> <property name="sizeGripEnabled" >
<name>sizeGripEnabled</name>
<bool>true</bool> <bool>true</bool>
</property> </property>
<vbox> <layout class="QVBoxLayout" >
<property stdset="1"> <property name="margin" >
<name>margin</name> <number>9</number>
<number>11</number>
</property> </property>
<property stdset="1"> <property name="spacing" >
<name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<widget> <item>
<class>QListView</class> <widget class="QTreeWidget" name="ListViewClients" >
<property name="rootIsDecorated" >
<bool>false</bool>
</property>
<column> <column>
<property> <property name="text" >
<name>text</name> <string>Client IP : Port</string>
<string>Column 1</string>
</property>
<property>
<name>clickable</name>
<bool>true</bool>
</property>
<property>
<name>resizeable</name>
<bool>true</bool>
</property> </property>
</column> </column>
<item> <column>
<property> <property name="text" >
<name>text</name> <string>Name</string>
<string>New Item</string>
</property> </property>
<property> </column>
<name>pixmap</name> <column>
<pixmap></pixmap> <property name="text" >
<string>Put</string>
</property> </property>
</item> </column>
<property stdset="1"> <column>
<name>name</name> <property name="text" >
<cstring>ListViewClients</cstring> <string>Get</string>
</property> </property>
</column>
<column>
<property name="text" >
<string>Jitter buffer size</string>
</property>
</column>
<column>
<property name="text" >
<string>Block Size In</string>
</property>
</column>
<column>
<property name="text" >
<string>Block Size Out</string>
</property>
</column>
</widget> </widget>
<widget> </item>
<class>QLayoutWidget</class> <item>
<property stdset="1"> <layout class="QHBoxLayout" >
<name>name</name> <property name="margin" >
<cstring>Layout3</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number> <number>0</number>
</property> </property>
<property stdset="1"> <property name="spacing" >
<name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<widget> <item>
<class>QLabel</class> <widget class="QLabel" name="TextLabelNameVersion" >
<property stdset="1"> <property name="text" >
<name>name</name>
<cstring>TextLabelNameVersion</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>TextLabelNameVersion</string> <string>TextLabelNameVersion</string>
</property> </property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget> </widget>
</item>
<item>
<spacer> <spacer>
<property> <property name="orientation" >
<name>name</name> <enum>Qt::Horizontal</enum>
<cstring>Horizontal Spacing2_2</cstring>
</property> </property>
<property> <property name="sizeType" >
<name>orientation</name> <enum>QSizePolicy::Fixed</enum>
<enum>Horizontal</enum>
</property> </property>
<property> <property name="sizeHint" >
<name>sizeType</name>
<enum>Fixed</enum>
</property>
<property>
<name>sizeHint</name>
<size> <size>
<width>72</width> <width>72</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget> </item>
<class>QLabel</class> <item>
<property stdset="1"> <widget class="QLabel" name="TextLabel1" >
<name>name</name> <property name="text" >
<cstring>TextLabel1</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Timing Standard Deviation:</string> <string>Timing Standard Deviation:</string>
</property> </property>
</widget> <property name="wordWrap" >
<widget> <bool>false</bool>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabelResponseTime</cstring>
</property> </property>
<property stdset="1"> </widget>
<name>text</name> </item>
<item>
<widget class="QLabel" name="TextLabelResponseTime" >
<property name="text" >
<string>TextLabelResponseTime</string> <string>TextLabelResponseTime</string>
</property> </property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget> </widget>
</item>
<item>
<spacer> <spacer>
<property> <property name="orientation" >
<name>name</name> <enum>Qt::Horizontal</enum>
<cstring>Horizontal Spacing2</cstring>
</property> </property>
<property> <property name="sizeType" >
<name>orientation</name> <enum>QSizePolicy::Expanding</enum>
<enum>Horizontal</enum>
</property> </property>
<property> <property name="sizeHint" >
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget> </item>
<class>QPushButton</class> <item>
<property stdset="1"> <widget class="QPushButton" name="buttonOk" >
<name>name</name> <property name="text" >
<cstring>buttonOk</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;OK</string> <string>&amp;OK</string>
</property> </property>
<property stdset="1"> <property name="autoDefault" >
<name>autoDefault</name>
<bool>true</bool> <bool>true</bool>
</property> </property>
<property stdset="1"> <property name="default" >
<name>default</name>
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</hbox> </item>
</layout>
</item>
</layout>
</widget> </widget>
</vbox> <resources/>
</widget>
<images>
<image>
<name>image0</name>
<data format="XPM.GZ" length="427">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2ea5248564056503300071f5205c0b2004719541dcb434986c22840b0260c56800454c9918b1c444e54454b1c4c4a424e5a4c4442431a0085008081231c4949511621021656565b042843a908032bade24a832547b21c6a1ba0f08d0fda18ccd6fd8c2009f58ad351700407358e1</data>
</image>
</images>
<connections> <connections>
<connection> <connection>
<sender>buttonOk</sender> <sender>buttonOk</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>CLlconServerDlgBase</receiver> <receiver>CLlconServerDlgBase</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection> </connection>
</connections> </connections>
</UI> </ui>

5
src/main.cpp
View file

@ -260,7 +260,12 @@ void PostWinMessage ( const _MESSAGE_IDENT MessID, const int iMessageParam,
CLlconEvent* LlconEv = CLlconEvent* LlconEv =
new CLlconEvent ( MessID, iMessageParam, iChanNum ); new CLlconEvent ( MessID, iMessageParam, iChanNum );
// TODO QT4
// Qt will delete the event object when done // Qt will delete the event object when done
// QThread::postEvent ( pApp->mainWidget(), LlconEv ); // QThread::postEvent ( pApp->mainWidget(), LlconEv );
} }
} }

6
src/multicolorled.cpp
View file

@ -30,7 +30,8 @@
/* Implementation *************************************************************/ /* Implementation *************************************************************/
CMultiColorLEDbase::CMultiColorLEDbase() : CMultiColorLEDbase::CMultiColorLEDbase ( QWidget* parent, Qt::WindowFlags f )
: QLabel ( parent, f ),
BitmCubeGreen ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ), BitmCubeGreen ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ),
BitmCubeRed ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ), BitmCubeRed ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ),
BitmCubeGrey ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ), BitmCubeGrey ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ),
@ -172,7 +173,8 @@ void CMultiColorLEDbase::SetUpdateTime ( int iNUTi )
} }
CMultiColorLED::CMultiColorLED ( QWidget* parent, Qt::WindowFlags f ) : QLabel ( parent, f ) CMultiColorLED::CMultiColorLED ( QWidget* parent, Qt::WindowFlags f )
: CMultiColorLEDbase ( parent, f )
{ {
// set modified style // set modified style
setFrameShape ( QFrame::Panel ); setFrameShape ( QFrame::Panel );

2
src/multicolorled.h
View file

@ -54,7 +54,7 @@ class CMultiColorLEDbase : public QLabel
Q_OBJECT Q_OBJECT
public: public:
CMultiColorLEDbase(); CMultiColorLEDbase ( QWidget* parent = 0, Qt::WindowFlags f = 0 );
void Reset(); void Reset();
void SetUpdateTime ( int iNUTi ); void SetUpdateTime ( int iNUTi );

19
src/socket.cpp
View file

@ -59,11 +59,8 @@ void CSocket::Init()
exit ( 1 ); exit ( 1 );
} }
QSocketNotifier* pSocketNotivRead =
new QSocketNotifier ( SocketDevice.socket (), QSocketNotifier::Read );
// connect the "activated" signal // connect the "activated" signal
QObject::connect ( pSocketNotivRead, SIGNAL ( activated ( int ) ), QObject::connect ( &SocketDevice, SIGNAL ( readyRead() ),
this, SLOT ( OnDataReceived() ) ); this, SLOT ( OnDataReceived() ) );
} }
@ -78,7 +75,7 @@ void CSocket::SendPacket ( const CVector<unsigned char>& vecbySendBuf,
// char vector in "const char*", for this we first convert the const // char vector in "const char*", for this we first convert the const
// unsigned char vector in a read/write unsigned char vector and then // unsigned char vector in a read/write unsigned char vector and then
// do the cast to const char*) // do the cast to const char*)
SocketDevice.writeBlock ( SocketDevice.writeDatagram (
(const char*) &( (CVector<unsigned char>) vecbySendBuf )[0], (const char*) &( (CVector<unsigned char>) vecbySendBuf )[0],
iVecSizeOut, HostAddr.InetAddr, HostAddr.iPort ); iVecSizeOut, HostAddr.InetAddr, HostAddr.iPort );
} }
@ -87,7 +84,7 @@ void CSocket::SendPacket ( const CVector<unsigned char>& vecbySendBuf,
void CSocket::OnDataReceived() void CSocket::OnDataReceived()
{ {
// read block from network interface // read block from network interface
const int iNumBytesRead = SocketDevice.readBlock ( (char*) &vecbyRecBuf[0], const int iNumBytesRead = SocketDevice.readDatagram ( (char*) &vecbyRecBuf[0],
MAX_SIZE_BYTES_NETW_BUF ); MAX_SIZE_BYTES_NETW_BUF );
// check if an error occurred // check if an error occurred
@ -133,8 +130,14 @@ void CSocket::OnDataReceived()
// this was an audio packet, start server // this was an audio packet, start server
// tell the server object to wake up if it // tell the server object to wake up if it
// is in sleep mode (Qt will delete the event object when done) // is in sleep mode (Qt will delete the event object when done)
QThread::postEvent ( pServer,
new CLlconEvent ( MS_PACKET_RECEIVED, 0, 0 ) );
// TODO QT4
// QThread::postEvent ( pServer,
// new CLlconEvent ( MS_PACKET_RECEIVED, 0, 0 ) );
} }
} }
} }

11
windows/MocQT.bat
View file

@ -40,7 +40,10 @@ rem .h --------------
rem .ui ------------- rem .ui -------------
%qtdir%\bin\uic.exe ..\src\aboutdlgbase_qt4.ui -o moc\aboutdlgbase.h %qtdir%\bin\uic.exe ..\src\aboutdlgbase.ui -o moc\aboutdlgbase.h
%qtdir%\bin\uic.exe ..\src\llconclientdlgbase_qt4.ui -o moc\llconclientdlgbase.h %qtdir%\bin\uic.exe ..\src\llconclientdlgbase.ui -o moc\llconclientdlgbase.h
%qtdir%\bin\uic.exe ..\src\clientsettingsdlgbase_qt4.ui -o moc\clientsettingsdlgbase.h %qtdir%\bin\uic.exe ..\src\clientsettingsdlgbase.ui -o moc\clientsettingsdlgbase.h
%qtdir%\bin\uic.exe ..\src\llconserverdlgbase_qt4.ui -o moc\llconserverdlgbase.h %qtdir%\bin\uic.exe ..\src\llconserverdlgbase.ui -o moc\llconserverdlgbase.h
rem .qrc ------------
%qtdir%\bin\rcc.exe ..\src\resources.qrc -o moc\resources.rcc

20
windows/llcon.sln Executable file
View file

@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llcon", "llcon.vcproj", "{DBBC16FC-BBCA-4E3B-A9F4-0EC5202A8B2E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DBBC16FC-BBCA-4E3B-A9F4-0EC5202A8B2E}.Debug|Win32.ActiveCfg = Debug|Win32
{DBBC16FC-BBCA-4E3B-A9F4-0EC5202A8B2E}.Debug|Win32.Build.0 = Debug|Win32
{DBBC16FC-BBCA-4E3B-A9F4-0EC5202A8B2E}.Release|Win32.ActiveCfg = Release|Win32
{DBBC16FC-BBCA-4E3B-A9F4-0EC5202A8B2E}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

1050
windows/llcon.vcproj Executable file
View file

File diff suppressed because it is too large Load diff