Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02:00
Code Issues Projects Releases Wiki Activity

2018-01-05 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed bugs that broke the build under Windows.
This commit is contained in:
Fred Gleason
2018-01-05 14:05:06 -05:00
parent c63ae45991
commit 7453013656
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -16557,3 +16557,5 @@
a new clock in rdlogmanager(1). a new clock in rdlogmanager(1).
2018-01-03 Fred Gleason <fredg@paravelsystems.com> 2018-01-03 Fred Gleason <fredg@paravelsystems.com>
* Fixed races in creation of new carts. * Fixed races in creation of new carts.
2018-01-05 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs that broke the build under Windows.

4
lib/lib.pro
View File

@@ -72,6 +72,7 @@ SOURCES += rdevent_line.cpp
SOURCES += rdexception_dialog.cpp SOURCES += rdexception_dialog.cpp
SOURCES += rdget_ath.cpp SOURCES += rdget_ath.cpp
SOURCES += rdgetpasswd.cpp SOURCES += rdgetpasswd.cpp
SOURCES += rdgroup.cpp
SOURCES += rdgroup_list.cpp SOURCES += rdgroup_list.cpp
SOURCES += rdidvalidator.cpp SOURCES += rdidvalidator.cpp
SOURCES += rdintegeredit.cpp SOURCES += rdintegeredit.cpp
@@ -152,7 +153,6 @@ x11 {
SOURCES += rdexport_settings_dialog.cpp SOURCES += rdexport_settings_dialog.cpp
SOURCES += rdgpioselector.cpp SOURCES += rdgpioselector.cpp
SOURCES += rdgrid.cpp SOURCES += rdgrid.cpp
SOURCES += rdgroup.cpp
SOURCES += rdhash.cpp SOURCES += rdhash.cpp
SOURCES += rdimport_audio.cpp SOURCES += rdimport_audio.cpp
SOURCES += rdkernelgpio.cpp SOURCES += rdkernelgpio.cpp
@@ -214,6 +214,7 @@ HEADERS += rdexception_dialog.h
HEADERS += rdget_ath.h HEADERS += rdget_ath.h
HEADERS += rdgetpasswd.h HEADERS += rdgetpasswd.h
HEADERS += rdgroup_list.h HEADERS += rdgroup_list.h
HEADERS += rdgroup.h
HEADERS += rd.h HEADERS += rd.h
HEADERS += rdidvalidator.h HEADERS += rdidvalidator.h
HEADERS += rdintegeredit.h HEADERS += rdintegeredit.h
@@ -292,7 +293,6 @@ x11 {
HEADERS += rdgpioselector.h HEADERS += rdgpioselector.h
HEADERS += rdgrid.h HEADERS += rdgrid.h
HEADERS += rdgpio.h HEADERS += rdgpio.h
HEADERS += rdgroup.h
HEADERS += rdhash.h HEADERS += rdhash.h
HEADERS += rdimport_audio.h HEADERS += rdimport_audio.h
HEADERS += rdkernelgpio.h HEADERS += rdkernelgpio.h

10
lib/rdgroup.cpp
View File

@@ -19,7 +19,9 @@
// //
#include <sys/types.h> #include <sys/types.h>
#ifndef WIN32
#include <unistd.h> #include <unistd.h>
#endif // WIN32
#include <qobject.h> #include <qobject.h>
@@ -230,7 +232,7 @@ void RDGroup::setColor(const QColor &color)
} }
unsigned RDGroup::RDGroup::nextFreeCart(unsigned startcart) const unsigned RDGroup::nextFreeCart(unsigned startcart) const
{ {
return GetNextFreeCart(startcart); return GetNextFreeCart(startcart);
} }
@@ -266,7 +268,7 @@ int RDGroup::freeCartQuantity() const
return free; return free;
} }
#ifndef WIN32
bool RDGroup::reserveCarts(std::vector<unsigned> *cart_nums, bool RDGroup::reserveCarts(std::vector<unsigned> *cart_nums,
const QString &station_name,RDCart::Type type, const QString &station_name,RDCart::Type type,
unsigned quan) const unsigned quan) const
@@ -301,7 +303,7 @@ bool RDGroup::reserveCarts(std::vector<unsigned> *cart_nums,
return false; return false;
} }
#endif // WIN32
bool RDGroup::cartNumberValid(unsigned cartnum) const bool RDGroup::cartNumberValid(unsigned cartnum) const
{ {
@@ -423,6 +425,7 @@ unsigned RDGroup::GetNextFreeCart(unsigned startcart) const
} }
#ifndef WIN32
bool RDGroup::ReserveCart(const QString &station_name,RDCart::Type type, bool RDGroup::ReserveCart(const QString &station_name,RDCart::Type type,
unsigned cart_num) const unsigned cart_num) const
{ {
@@ -448,6 +451,7 @@ bool RDGroup::ReserveCart(const QString &station_name,RDCart::Type type,
} }
return ret; return ret;
} }
#endif // WIN32
void RDGroup::SetRow(const QString &param,int value) const void RDGroup::SetRow(const QString &param,int value) const

4
lib/rdgroup.h
View File

@@ -60,16 +60,20 @@ class RDGroup
void setColor(const QColor &color); void setColor(const QColor &color);
unsigned nextFreeCart(unsigned startcart=0) const; unsigned nextFreeCart(unsigned startcart=0) const;
int freeCartQuantity() const; int freeCartQuantity() const;
#ifndef WIN32
bool reserveCarts(std::vector<unsigned> *cart_nums, bool reserveCarts(std::vector<unsigned> *cart_nums,
const QString &station_name,RDCart::Type type, const QString &station_name,RDCart::Type type,
unsigned quan) const; unsigned quan) const;
#endif // WIN32
bool cartNumberValid(unsigned cartnum) const; bool cartNumberValid(unsigned cartnum) const;
QString xml() const; QString xml() const;
private: private:
unsigned GetNextFreeCart(unsigned startcart) const; unsigned GetNextFreeCart(unsigned startcart) const;
#ifndef WIN32
bool ReserveCart(const QString &station_name,RDCart::Type type, bool ReserveCart(const QString &station_name,RDCart::Type type,
unsigned cart_num) const; unsigned cart_num) const;
#endif // WIN32
void SetRow(const QString &param,int value) const; void SetRow(const QString &param,int value) const;
void SetRow(const QString &param,unsigned value) const; void SetRow(const QString &param,unsigned value) const;
void SetRow(const QString &param,const QString &value) const; void SetRow(const QString &param,const QString &value) const;

BIN
rivendell.ism
View File

Binary file not shown.