Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-07 01:13:50 +02:00
Code Issues Projects Releases Wiki Activity

2018-10-19 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed check for Win32 installer from 'configure.ac'.
	* Removed win32 clauses from '.pro' files.
This commit is contained in:
Fred Gleason 2018-10-19 19:36:43 -04:00
parent 75bec4d3c4
commit 3768a5fb14
19 changed files with 160 additions and 835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17848,3 +17848,6 @@
2018-10-19 Fred Gleason <fredg@paravelsystems.com>
* Removed 'build_win32.bat'.
* Removed all conditional compilation based on 'WIN32'.
2018-10-19 Fred Gleason <fredg@paravelsystems.com>
* Removed check for Win32 installer from 'configure.ac'.
* Removed win32 clauses from '.pro' files.

15
configure.ac
View File

@ -414,16 +414,6 @@ fi
#
# Configure RPM Build
#
AC_MSG_CHECKING([for $WIN32_SETUPS/rivendell-$VERSION-$RPM_RELEASE.exe])
if test -f $WIN32_SETUPS/rivendell-$VERSION-$RPM_RELEASE.exe ; then
AC_MSG_RESULT([yes])
AC_SUBST(WIN32_SOURCE,"$WIN32_SETUPS/rivendell-$VERSION-$RPM_RELEASE.exe")
AC_SUBST(WIN32_PATH,"/var/win32/rivendell-$VERSION-$RPM_RELEASE.exe")
else
AC_MSG_RESULT([no])
AC_SUBST(WIN32_SOURCE,"")
AC_SUBST(WIN32_PATH,"")
fi
AC_CHECK_PROG(RPMBUILD_FOUND,rpmbuild,[yes],[])
if test -z $RPMBUILD_FOUND ; then
AC_SUBST(RPMBUILD,rpm)
@ -621,11 +611,6 @@ AC_MSG_NOTICE("| M4A Decoding Support ... Yes |")
fi
AC_MSG_NOTICE("|-----------------------------------------------------|")
AC_MSG_NOTICE()
if test $WIN32_SOURCE ; then
AC_MSG_NOTICE([Including RPM win32 setup from:])
AC_MSG_NOTICE([ $WIN32_SOURCE])
AC_MSG_NOTICE()
fi
AC_MSG_NOTICE()
AC_MSG_NOTICE(Now enter 'make' to build the software.)
AC_MSG_NOTICE()

5
lib/Makefile.am
View File

@ -351,10 +351,7 @@ EXTRA_DIST = gpl2.html\
librd_nb.ts\
librd_nn.ts\
librd_pt_BR.ts\
rdpaths.h.in\
rdttydevice_win32.cpp\
rdwin32.cpp\
rdwin32.h
rdpaths.h.in
CLEANFILES = *~\
moc_*\

233
lib/lib.pro
View File

@ -2,7 +2,7 @@
#
# The lib/ QMake project file for Rivendell.
#
# (C) Copyright 2003-2016 Fred Gleason <fredg@paravelsystems.com>
# (C) Copyright 2003-2018 Fred Gleason <fredg@paravelsystems.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
@ -17,16 +17,12 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
TEMPLATE = lib
win32 {
DEFINES += WIN32
DEFINES += VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE=\"rivendell\"
DEFINES += PACKAGE_VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE_NAME=\"rivendell\"
DEFINES += PACKAGE_BUGREPORT=\"fredg@paravelsystems.com\"
}
#
# Maintainer's Note
#
# We don't use Qt's 'Qmake' build system, so the entries in here are
# purely for the sake of i18n support.
#
SOURCES += export_bmiemr.cpp
SOURCES += export_cutlog.cpp
@ -40,47 +36,76 @@ SOURCES += export_spincount.cpp
SOURCES += export_soundex.cpp
SOURCES += export_technical.cpp
SOURCES += export_textlog.cpp
SOURCES += html_gpl2.cpp
SOURCES += rdadd_log.cpp
SOURCES += rdadd_cart.cpp
SOURCES += rdairplay_conf.cpp
SOURCES += rdapplication.cpp
SOURCES += rdaudio_exists.cpp
SOURCES += rdaudio_port.cpp
SOURCES += rdaudiosettings.cpp
SOURCES += rdaudiosettings_dialog.cpp
SOURCES += rdbusybar.cpp
SOURCES += rdbusydialog.cpp
SOURCES += rdbutton_dialog.cpp
SOURCES += rdbutton_panel.cpp
SOURCES += rdcae.cpp
SOURCES += rdcardselector.cpp
SOURCES += rdcart.cpp
SOURCES += rdcart_dialog.cpp
SOURCES += rdcart_search_text.cpp
SOURCES += rdcartdrag.cpp
SOURCES += rdcatch_connect.cpp
SOURCES += rdcddblookup.cpp
SOURCES += rdcdplayer.cpp
SOURCES += rdcddbrecord.cpp
SOURCES += rdcheck_version.cpp
SOURCES += rdclock.cpp
SOURCES += rdcmd_cache.cpp
SOURCES += rdcmd_switch.cpp
SOURCES += rdcombobox.cpp
SOURCES += rdconf.cpp
SOURCES += rdconfig.cpp
SOURCES += rdcueedit.cpp
SOURCES += rdcueeditdialog.cpp
SOURCES += rdcut.cpp
SOURCES += rdcut_path.cpp
SOURCES += rdcut_dialog.cpp
SOURCES += rddatedialog.cpp
SOURCES += rddatedecode.cpp
SOURCES += rddatepicker.cpp
SOURCES += rddb.cpp
SOURCES += rddbheartbeat.cpp
SOURCES += rddebug.cpp
SOURCES += rddeck.cpp
SOURCES += rddropbox.cpp
SOURCES += rdedit_audio.cpp
SOURCES += rdedit_panel_name.cpp
SOURCES += rdemptycart.cpp
SOURCES += rdescape_string.cpp
SOURCES += rdevent.cpp
SOURCES += rdevent_line.cpp
SOURCES += rdeventimportlist.cpp
SOURCES += rdexception_dialog.cpp
SOURCES += rdexport_settings_dialog.cpp
SOURCES += rdget_ath.cpp
SOURCES += rdgetpasswd.cpp
SOURCES += rdgpioselector.cpp
SOURCES += rdgrid.cpp
SOURCES += rdgroup.cpp
SOURCES += rdgroup_list.cpp
SOURCES += rdhash.cpp
SOURCES += rdidvalidator.cpp
SOURCES += rdimport_audio.cpp
SOURCES += rdintegeredit.cpp
SOURCES += rdintegerdialog.cpp
SOURCES += rdkernelgpio.cpp
SOURCES += rdlabel.cpp
SOURCES += rdlibrary_conf.cpp
SOURCES += rdlicense.cpp
SOURCES += rdlineedit.cpp
SOURCES += rdlist_logs.cpp
SOURCES += rdlist_groups.cpp
SOURCES += rdlistselector.cpp
SOURCES += rdlistview.cpp
SOURCES += rdlistviewitem.cpp
@ -90,23 +115,38 @@ SOURCES += rdlog_line.cpp
SOURCES += rdlogedit_conf.cpp
SOURCES += rdlogfilter.cpp
SOURCES += rdloglock.cpp
SOURCES += rdlogplay.cpp
SOURCES += rdmacro.cpp
SOURCES += rdmacro_event.cpp
SOURCES += rdmarker_button.cpp
SOURCES += rdmarker_edit.cpp
SOURCES += rdmatrix.cpp
SOURCES += rdmonitor_config.cpp
SOURCES += rdnotification.cpp
SOURCES += rdoneshot.cpp
SOURCES += rdpanel_button.cpp
SOURCES += rdpasswd.cpp
SOURCES += rdplay_deck.cpp
SOURCES += rdplaymeter.cpp
SOURCES += rdprofile.cpp
SOURCES += rdprofileline.cpp
SOURCES += rdprofilesection.cpp
SOURCES += rdpushbutton.cpp
SOURCES += rdrecording.cpp
SOURCES += rdrehash.cpp
SOURCES += rdrenderer.cpp
SOURCES += rdreport.cpp
SOURCES += rdripc.cpp
SOURCES += rdrlmhost.cpp
SOURCES += rdschedcode.cpp
SOURCES += rdsegmeter.cpp
SOURCES += rdsettings.cpp
SOURCES += rdsimpleplayer.cpp
SOURCES += rdslider.cpp
SOURCES += rdsocket.cpp
SOURCES += rdsound_panel.cpp
SOURCES += rdstation.cpp
SOURCES += rdstatus.cpp
SOURCES += rdstereometer.cpp
SOURCES += rdsvc.cpp
SOURCES += rdsystem.cpp
@ -116,87 +156,53 @@ SOURCES += rdtextvalidator.cpp
SOURCES += rdtimeedit.cpp
SOURCES += rdtimeengine.cpp
SOURCES += rdtransportbutton.cpp
SOURCES += rdtty.cpp
SOURCES += rdttydevice.cpp
SOURCES += rdttyout.cpp
SOURCES += rduser.cpp
SOURCES += rdversion.cpp
SOURCES += rdwavedata.cpp
SOURCES += rdwavefile.cpp
SOURCES += rdweb.cpp
SOURCES += schedcartlist.cpp
SOURCES += schedruleslist.cpp
win32 {
SOURCES += html_gpl2_win32.cpp
SOURCES += rdttydevice_win32.cpp
SOURCES += rdwin32.cpp
}
x11 {
SOURCES += html_gpl2.cpp
SOURCES += rdadd_cart.cpp
SOURCES += rdairplay_conf.cpp
SOURCES += rdaudio_exists.cpp
SOURCES += rdaudio_port.cpp
SOURCES += rdbutton_dialog.cpp
SOURCES += rdbutton_panel.cpp
SOURCES += rdcae.cpp
SOURCES += rdcardselector.cpp
SOURCES += rdcatch_connect.cpp
SOURCES += rdcddblookup.cpp
SOURCES += rdcdplayer.cpp
SOURCES += rdcddbrecord.cpp
SOURCES += rdcheck_version.cpp
SOURCES += rdcmd_cache.cpp
SOURCES += rdcueedit.cpp
SOURCES += rdcueeditdialog.cpp
SOURCES += rdcut_dialog.cpp
SOURCES += rdcut_path.cpp
SOURCES += rddeck.cpp
SOURCES += rdedit_audio.cpp
SOURCES += rdedit_panel_name.cpp
SOURCES += rdexport_settings_dialog.cpp
SOURCES += rdgpioselector.cpp
SOURCES += rdgrid.cpp
SOURCES += rdhash.cpp
SOURCES += rdimport_audio.cpp
SOURCES += rdkernelgpio.cpp
SOURCES += rdlist_groups.cpp
SOURCES += rdlogplay.cpp
SOURCES += rdmarker_button.cpp
SOURCES += rdmarker_edit.cpp
SOURCES += rdmatrix.cpp
SOURCES += rdmonitor_config.cpp
SOURCES += rdpanel_button.cpp
SOURCES += rdpasswd.cpp
SOURCES += rdplay_deck.cpp
SOURCES += rdrecording.cpp
SOURCES += rdrehash.cpp
SOURCES += rdrenderer.cpp
SOURCES += rdrlmhost.cpp
SOURCES += rdsimpleplayer.cpp
SOURCES += rdsound_panel.cpp
SOURCES += rdstatus.cpp
SOURCES += rdtimeedit.cpp
SOURCES += rdtty.cpp
SOURCES += rdttydevice.cpp
SOURCES += rdttyout.cpp
SOURCES += rdversion.cpp
SOURCES += rdwavefile.cpp
}
HEADERS += schedcartlist.h
HEADERS += schedruleslist.h
HEADERS += rd.h
HEADERS += rdadd_cart.h
HEADERS += rdadd_log.h
HEADERS += rdairplay_conf.h
HEADERS += rdapplication.h
HEADERS += rdaudio_exists.h
HEADERS += rdaudio_port.h
HEADERS += rdaudiosettings.h
HEADERS += rdaudiosettings_dialog.h
HEADERS += rdbusybar.h
HEADERS += rdbusydialog.h
HEADERS += rdbutton_dialog.h
HEADERS += rdbutton_panel.h
HEADERS += rdcae.h
HEADERS += rdcardselector.h
HEADERS += rdcart.h
HEADERS += rdcart_dialog.h
HEADERS += rdcart_search_text.h
HEADERS += rdcartdrag.h
HEADERS += rdcatch_connect.h
HEADERS += rdcddblookup.h
HEADERS += rdcdplayer.h
HEADERS += rdcddbrecord.h
HEADERS += rdcheck_version.h
HEADERS += rdclock.h
HEADERS += rdcmd_cache.h
HEADERS += rdcmd_switch.h
HEADERS += rdcombobox.h
HEADERS += rdconf.h
HEADERS += rdconfig.h
HEADERS += rdcueedit.h
HEADERS += rdcueeditdialog.h
HEADERS += rdcut_dialog.h
HEADERS += rdcut_path.h
HEADERS += rdcut.h
HEADERS += rddatedecode.h
HEADERS += rddatedialog.h
@ -204,25 +210,35 @@ HEADERS += rddatepicker.h
HEADERS += rddb.h
HEADERS += rddbheartbeat.h
HEADERS += rddebug.h
HEADERS += rddeck.h
HEADERS += rddropbox.h
HEADERS += rdedit_audio.h
HEADERS += rdedit_panel_name.h
HEADERS += rdemptycart.h
HEADERS += rdescape_string.h
HEADERS += rdevent.h
HEADERS += rdevent_line.h
HEADERS += rdeventimportlist.h
HEADERS += rdexception_dialog.h
HEADERS += rdexport_settings_dialog.h
HEADERS += rdget_ath.h
HEADERS += rdgetpasswd.h
HEADERS += rdgpioselector.h
HEADERS += rdgrid.h
HEADERS += rdgpio.h
HEADERS += rdgroup_list.h
HEADERS += rdgroup.h
HEADERS += rd.h
HEADERS += rdhash.h
HEADERS += rdidvalidator.h
HEADERS += rdimport_audio.h
HEADERS += rdintegeredit.h
HEADERS += rdintegerdialog.h
HEADERS += rdkernelgpio.h
HEADERS += rdlabel.h
HEADERS += rdlibrary_conf.h
HEADERS += rdlicense.h
HEADERS += rdlineedit.h
HEADERS += rdlist_groups.h
HEADERS += rdlist_logs.h
HEADERS += rdlistselector.h
HEADERS += rdlistview.h
@ -233,23 +249,39 @@ HEADERS += rdlog_line.h
HEADERS += rdlogedit_conf.h
HEADERS += rdlogfilter.h
HEADERS += rdloglock.h
HEADERS += rdlogplay.h
HEADERS += rdmacro.h
HEADERS += rdmacro_event.h
HEADERS += rdmarker_button.h
HEADERS += rdmarker_edit.h
HEADERS += rdmatrix.h
HEADERS += rdmonitor_config.h
HEADERS += rdnotification.h
HEADERS += rdoneshot.h
HEADERS += rdpanel_button.h
HEADERS += rdpaths.h
HEADERS += rdpasswd.h
HEADERS += rdplay_deck.h
HEADERS += rdplaymeter.h
HEADERS += rdprofile.h
HEADERS += rdprofileline.h
HEADERS += rdprofilesection.h
HEADERS += rdpushbutton.h
HEADERS += rdrecording.h
HEADERS += rdrehash.h
HEADERS += rdrenderer.h
HEADERS += rdreport.h
HEADERS += rdripc.h
HEADERS += rdrlmhost.h
HEADERS += rdschedcode.h
HEADERS += rdsegmeter.h
HEADERS += rdsettings.h
HEADERS += rdsimpleplayer.h
HEADERS += rdslider.h
HEADERS += rdsocket.h
HEADERS += rdsound_panel.h
HEADERS += rdstation.h
HEADERS += rdstatus.h
HEADERS += rdstereometer.h
HEADERS += rdsvc.h
HEADERS += rdsystem.h
@ -257,72 +289,17 @@ HEADERS += rdtempdirectory.h
HEADERS += rdtextfile.h
HEADERS += rdtextvalidator.h
HEADERS += rdtimeedit.h
HEADERS += rdtimeedit.h
HEADERS += rdtimeengine.h
HEADERS += rdtransportbutton.h
HEADERS += rdtty.h
HEADERS += rdttydevice.h
HEADERS += rdttyout.h
HEADERS += rduser.h
HEADERS += rdversion.h
HEADERS += rdwavedata.h
HEADERS += rdweb.h
win32 {
HEADERS += rdwin32.h
}
x11 {
HEADERS += rdadd_cart.h
HEADERS += rdairplay_conf.h
HEADERS += rdaudio_exists.h
HEADERS += rdaudio_port.h
HEADERS += rdbutton_dialog.h
HEADERS += rdbutton_panel.h
HEADERS += rdcae.h
HEADERS += rdcardselector.h
HEADERS += rdcatch_connect.h
HEADERS += rdcddblookup.h
HEADERS += rdcdplayer.h
HEADERS += rdcddbrecord.h
HEADERS += rdcheck_version.h
HEADERS += rdcmd_cache.h
HEADERS += rdcueedit.h
HEADERS += rdcueeditdialog.h
HEADERS += rdcut_dialog.h
HEADERS += rdcut_path.h
HEADERS += rddeck.h
HEADERS += rdedit_audio.h
HEADERS += rdedit_panel_name.h
HEADERS += rdexport_settings_dialog.h
HEADERS += rdgpioselector.h
HEADERS += rdgrid.h
HEADERS += rdgpio.h
HEADERS += rdhash.h
HEADERS += rdimport_audio.h
HEADERS += rdkernelgpio.h
HEADERS += rdlist_groups.h
HEADERS += rdlogplay.h
HEADERS += rdmarker_button.h
HEADERS += rdmarker_edit.h
HEADERS += rdmatrix.h
HEADERS += rdmonitor_config.h
HEADERS += rdpanel_button.h
HEADERS += rdpaths.h
HEADERS += rdpasswd.h
HEADERS += rdplay_deck.h
HEADERS += rdrecording.h
HEADERS += rdrehash.h
HEADERS += rdrenderer.h
HEADERS += rdrlmhost.h
HEADERS += rdsimpleplayer.h
HEADERS += rdsound_panel.h
HEADERS += rdstatus.h
HEADERS += rdtimeedit.h
HEADERS += rdtty.h
HEADERS += rdttyout.h
HEADERS += rdversion.h
}
INCLUDEPATH += ..\..\libradio\radio
CONFIG += qt staticlib
TRANSLATIONS += librd_cs.ts
TRANSLATIONS += librd_de.ts
TRANSLATIONS += librd_es.ts

366
lib/rdttydevice_win32.cpp
View File

@ -1,366 +0,0 @@
// rdttydevice_win32.cpp
//
// The Win32 version of a Qt driver for serial ports.
//
// (C) Copyright 2002,2016 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
// version 2 as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
//
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <qiodevice.h>
#include <rdttydevice.h>
RDTTYDevice::RDTTYDevice() : QIODevice()
{
Init();
}
RDTTYDevice::~RDTTYDevice()
{
if(tty_open) {
close();
}
}
bool RDTTYDevice::open(int mode)
{
DWORD flags=0;
WCHAR name[255];
DCB dcb;
COMMTIMEOUTS timeouts;
tty_mode=mode;
if((mode&QIODevice::ReadWrite)==QIODevice::ReadWrite) {
flags|=GENERIC_WRITE|GENERIC_READ;
}
else {
if(((mode&QIODevice::WriteOnly)!=0)) {
flags|=GENERIC_WRITE;
}
if(((mode&QIODevice::ReadOnly)!=0)) {
flags|=GENERIC_READ;
}
}
wcscpy(name,(TCHAR*)qt_winTchar(tty_name,true));
tty_fd=CreateFile(name,flags,0,NULL,OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL,NULL);
if(tty_fd==INVALID_HANDLE_VALUE) {
tty_status=IO_OpenError;
return false;
}
tty_open=true;
tty_status=IO_Ok;
SetupComm(tty_fd,WIN32_BUFFER_SIZE,WIN32_BUFFER_SIZE);
switch(tty_parity) {
case RDTTYDevice::None:
BuildCommDCB((TCHAR*)qt_winTchar(QString().
sprintf("%d,N,%d,1",
tty_speed,tty_length),
true),&dcb);
break;
case RDTTYDevice::Even:
BuildCommDCB((TCHAR*)qt_winTchar(QString().
sprintf("%d,E,%d,1",
tty_speed,tty_length),
true),&dcb);
break;
case RDTTYDevice::Odd:
BuildCommDCB((TCHAR*)qt_winTchar(QString().
sprintf("%d,O,%d,1",
tty_speed,tty_length),
true),&dcb);
break;
}
SetCommState(tty_fd,&dcb);
timeouts.ReadIntervalTimeout=MAXDWORD;
timeouts.ReadTotalTimeoutMultiplier=0;
timeouts.ReadTotalTimeoutConstant=0;
timeouts.WriteTotalTimeoutMultiplier=0;
timeouts.WriteTotalTimeoutConstant=0;
SetCommTimeouts(tty_fd,&timeouts);
return true;
}
void RDTTYDevice::close()
{
if(tty_open) {
CloseHandle(tty_fd);
}
tty_open=false;
}
void RDTTYDevice::flush()
{
}
Q_LONG RDTTYDevice::readBlock(char *data,Q_ULONG maxlen)
{
Q_ULONG n;
if(!ReadFile(tty_fd,data,maxlen,&n,NULL)) {
if(GetLastError()!=ERROR_TIMEOUT) {
tty_status=IO_ReadError;
return -1;
}
}
tty_status=IO_Ok;
return n;
}
Q_LONG RDTTYDevice::writeBlock(const char *data,Q_ULONG len)
{
Q_ULONG n;
if(!WriteFile(tty_fd,data,len,&n,NULL)) {
tty_status=IO_WriteError;
return n;
}
tty_status=IO_Ok;
return n;
}
int RDTTYDevice::getch()
{
char c;
int n;
if((n=readBlock(&c,1))<0) {
tty_status=IO_ReadError;
return -1;
}
return (int)c;
}
int RDTTYDevice::putch(int ch)
{
char c;
int n;
c=(char)ch;
if((n=writeBlock(&c,1))<0) {
tty_status=IO_WriteError;
return -1;
}
return ch;
}
int RDTTYDevice::ungetch(int ch)
{
tty_status=IO_WriteError;
return -1;
}
qlonglong RDTTYDevice::size() const
{
return 0;
}
int RDTTYDevice::flags() const
{
return tty_mode|state();
}
int RDTTYDevice::mode() const
{
return tty_mode;
}
int RDTTYDevice::state() const
{
if(tty_open) {
return IO_Open;
}
return 0;
}
bool RDTTYDevice::isDirectAccess() const
{
return false;
}
bool RDTTYDevice::isSequentialAccess() const
{
return true;
}
bool RDTTYDevice::isCombinedAccess() const
{
return false;
}
bool RDTTYDevice::isBuffered() const
{
return false;
}
bool RDTTYDevice::isRaw() const
{
return true;
}
bool RDTTYDevice::isSynchronous() const
{
return true;
}
bool RDTTYDevice::isAsynchronous() const
{
return false;
}
bool RDTTYDevice::isTranslated() const
{
return false;
}
bool RDTTYDevice::isReadable() const
{
if(((tty_mode&QIODevice::ReadOnly)!=0)||((tty_mode&QIODevice::ReadWrite)!=0)) {
return true;
}
return false;
}
bool RDTTYDevice::isWritable() const
{
if(((tty_mode&QIODevice::WriteOnly)!=0)||((tty_mode&QIODevice::ReadWrite)!=0)) {
return true;
}
return false;
}
bool RDTTYDevice::isReadWrite() const
{
if((tty_mode&QIODevice::ReadWrite)!=0) {
return true;
}
return false;
}
bool RDTTYDevice::isInactive() const
{
if(!tty_open) {
return true;
}
return false;
}
bool RDTTYDevice::isOpen() const
{
if(tty_open) {
return true;
}
return false;
}
int RDTTYDevice::status() const
{
return tty_status;
}
void RDTTYDevice::resetStatus()
{
tty_status=IO_Ok;
}
void RDTTYDevice::setName(QString name)
{
tty_name=name;
}
int RDTTYDevice::speed() const
{
return tty_speed;
}
void RDTTYDevice::setSpeed(int speed)
{
tty_speed=speed;
}
int RDTTYDevice::wordLength() const
{
return tty_length;
}
void RDTTYDevice::setWordLength(int length)
{
tty_length=length;
}
RDTTYDevice::Parity RDTTYDevice::parity() const
{
return tty_parity;
}
void RDTTYDevice::setParity(Parity parity)
{
tty_parity=parity;
}
void RDTTYDevice::Init()
{
tty_speed=9600;
tty_length=8;
tty_parity=RDTTYDevice::None;
tty_open=false;
}

27
lib/rdwin32.cpp
View File

@ -1,27 +0,0 @@
// rdwin32.cpp
//
// Missing POSIX functions for Win32
//
// (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
int isblank(int c)
{
if(c==' ') {
return 0;
}
return 1;
}

27
lib/rdwin32.h
View File

@ -1,27 +0,0 @@
// rdwin32.h
//
// Missing POSIX functions for Win32
//
// (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef RDWIN32_H
#define RDWIN32_H
int isblank(int c);
#endif // RDWIN32_H

28
rdcastmanager/rdcastmanager.pro
View File

@ -2,7 +2,7 @@
#
# The rdcastmanager/ QMake project file for Rivendell
#
# (C) Copyright 2003-2004,2016 Fred Gleason <fredg@paravelsystems.com>
# (C) Copyright 2003-2018 Fred Gleason <fredg@paravelsystems.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
@ -17,18 +17,12 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
TEMPLATE = app
TARGET = rdlogmanager
win32 {
DEFINES += WIN32
DEFINES += VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE=\"rivendell\"
DEFINES += PACKAGE_VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE_NAME=\"rivendell\"
DEFINES += PACKAGE_BUGREPORT=\"fredg@paravelsystems.com\"
}
#
# Maintainer's Note
#
# We don't use Qt's 'Qmake' build system, so the entries in here are
# purely for the sake of i18n support.
#
SOURCES += rdcastmanager.cpp
SOURCES += edit_cast.cpp
@ -40,14 +34,6 @@ HEADERS += edit_cast.h
HEADERS += list_casts.h
HEADERS += pick_report_dates.h
RES_FILE += ..\icons\rivendell.res
INCLUDEPATH += ..\lib
LIBS = -lqui -L..\lib -llib
CONFIG += qt
TRANSLATIONS += rdcastmanager_cs.ts
TRANSLATIONS += rdcastmanager_de.ts
TRANSLATIONS += rdcastmanager_es.ts

46
rdhpi/rdhpi.pro
View File

@ -17,36 +17,26 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
TEMPLATE = lib
#
# Maintainer's Note
#
# We don't use Qt's 'Qmake' build system, so the entries in here are
# purely for the sake of i18n support.
#
win32 {
DEFINES += WIN32
DEFINES += VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE=\"rivendell\"
DEFINES += PACKAGE_VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE_NAME=\"rivendell\"
DEFINES += PACKAGE_BUGREPORT=\"fredg@paravelsystems.com\"
}
SOURCES += rdhpicardselector.cpp
SOURCES += rdhpiinformation.cpp
SOURCES += rdhpiplaystream.cpp
SOURCES += rdhpirecordstream.cpp
SOURCES += rdhpisoundcard.cpp
SOURCES += rdhpisoundselector.cpp
x11 {
SOURCES += rdhpicardselector.cpp
SOURCES += rdhpiinformation.cpp
SOURCES += rdhpiplaystream.cpp
SOURCES += rdhpirecordstream.cpp
SOURCES += rdhpisoundcard.cpp
SOURCES += rdhpisoundselector.cpp
}
x11 {
HEADERS += rdhpicardselector.h
HEADERS += rdhpiinformation.h
HEADERS += rdhpiplaystream.h
HEADERS += rdhpirecordstream.h
HEADERS += rdhpisoundcard.h
HEADERS += rdhpisoundselector.h
}
CONFIG += qt staticlib
HEADERS += rdhpicardselector.h
HEADERS += rdhpiinformation.h
HEADERS += rdhpiplaystream.h
HEADERS += rdhpirecordstream.h
HEADERS += rdhpisoundcard.h
HEADERS += rdhpisoundselector.h
TRANSLATIONS += rdhpi_cs.ts
TRANSLATIONS += rdhpi_de.ts

40
rdlogedit/rdlogedit.pro
View File

@ -2,7 +2,7 @@
#
# The rdlogedit/ QMake project file for Rivendell
#
# (C) Copyright 2003-2004,2016 Fred Gleason <fredg@paravelsystems.com>
# (C) Copyright 2003-2018 Fred Gleason <fredg@paravelsystems.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
@ -17,18 +17,12 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
TEMPLATE = app
TARGET = rdlogedit
win32 {
DEFINES += WIN32
DEFINES += VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE=\"rivendell\"
DEFINES += PACKAGE_VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE_NAME=\"rivendell\"
DEFINES += PACKAGE_BUGREPORT=\"fredg@paravelsystems.com\"
}
#
# Maintainer's Note
#
# We don't use Qt's 'Qmake' build system, so the entries in here are
# purely for the sake of i18n support.
#
SOURCES += add_meta.cpp
SOURCES += drop_listview.cpp
@ -40,10 +34,8 @@ SOURCES += edit_track.cpp
SOURCES += list_listviewitem.cpp
SOURCES += list_reports.cpp
SOURCES += rdlogedit.cpp
x11 {
SOURCES += render_dialog.cpp
SOURCES += voice_tracker.cpp
}
SOURCES += render_dialog.cpp
SOURCES += voice_tracker.cpp
HEADERS += add_meta.h
HEADERS += drop_listview.h
@ -56,18 +48,8 @@ HEADERS += globals.h
HEADERS += list_listviewitem.h
HEADERS += list_reports.h
HEADERS += rdlogedit.h
x11 {
HEADERS += render_dialog.h
HEADERS += voice_tracker.h
}
RES_FILE += ..\icons\rivendell.res
INCLUDEPATH += ..\lib
LIBS = -lqui -L..\lib -llib
CONFIG += qt
HEADERS += render_dialog.h
HEADERS += voice_tracker.h
TRANSLATIONS += rdlogedit_cs.ts
TRANSLATIONS += rdlogedit_de.ts

28
rdlogmanager/rdlogmanager.pro
View File

@ -2,7 +2,7 @@
#
# The rdlogmanager/ QMake project file for Rivendell
#
# (C) Copyright 2003-2004,2016 Fred Gleason <fredg@paravelsystems.com>
# (C) Copyright 2003-2018 Fred Gleason <fredg@paravelsystems.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
@ -17,18 +17,12 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
TEMPLATE = app
TARGET = rdlogmanager
win32 {
DEFINES += WIN32
DEFINES += VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE=\"rivendell\"
DEFINES += PACKAGE_VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE_NAME=\"rivendell\"
DEFINES += PACKAGE_BUGREPORT=\"fredg@paravelsystems.com\"
}
#
# Maintainer's Note
#
# We don't use Qt's 'Qmake' build system, so the entries in here are
# purely for the sake of i18n support.
#
SOURCES += add_clock.cpp
SOURCES += add_event.cpp
@ -82,14 +76,6 @@ HEADERS += rename_item.h
HEADERS += svc_rec.h
HEADERS += svc_rec_dialog.h
RES_FILE += ..\icons\rivendell.res
INCLUDEPATH += ..\lib
LIBS = -lqui -L..\lib -llib
CONFIG += qt
TRANSLATIONS += rdlogmanager_cs.ts
TRANSLATIONS += rdlogmanager_de.ts
TRANSLATIONS += rdlogmanager_es.ts

2
ripcd/Makefile.am
View File

@ -128,8 +128,6 @@ nodist_ripcd_SOURCES = moc_am16.cpp\
ripcd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @LIBHPI@ -lQt3Support
EXTRA_DIST = ripcd.pro
CLEANFILES = *~\
*.idb\
*ilk\

53
ripcd/ripcd.pro
View File

@ -1,53 +0,0 @@
# ripcd.pro
#
# The ripcd/ QMake project file for Rivendell
#
# (C) Copyright 2003-2005,2016 Fred Gleason <fredg@paravelsystems.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
TEMPLATE = app
TARGET = ripcd
win32 {
DEFINES += WIN32
}
SOURCES += rdlogedit.cpp
SOURCES += edit_log.cpp
SOURCES += edit_logline.cpp
SOURCES += edit_marker.cpp
SOURCES += edit_chain.cpp
SOURCES += add_meta.cpp
SOURCES += list_logs.cpp
HEADERS += rdlogedit.h
HEADERS += edit_log.h
HEADERS += edit_logline.h
HEADERS += edit_marker.h
HEADERS += edit_chain.h
HEADERS += add_meta.h
HEADERS += list_logs.h
HEADERS += globals.h
RES_FILE += ..\icons\rivendell.res
INCLUDEPATH += ..\..\libradio\radio ..\lib
LIBS = -lqui -L..\..\libradio\radio -lradio -L..\lib -llib
CONFIG += qt
TRANSLATIONS += rdlogedit_es.ts

5
rivendell.spec.in
View File

@ -108,10 +108,6 @@ rm -f $RPM_BUILD_ROOT/@LOCAL_PREFIX@/@RD_LIB_PATH@/libqmysqlutf*
mkdir $RPM_BUILD_ROOT/.qt
touch $RPM_BUILD_ROOT/.qt/qt
rm -rf $RPM_BUILD_ROOT/@libexecdir@/logos
if test "@WIN32_SOURCE@" ; then
mkdir -p $RPM_BUILD_ROOT/var/win32
cp @WIN32_SOURCE@ $RPM_BUILD_ROOT/var/win32/
fi
mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/logos
cp icons/webget_logo.png $RPM_BUILD_ROOT/@DOC_PATH@/logos/
cp AUTHORS $RPM_BUILD_ROOT/@DOC_PATH@/
@ -365,7 +361,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(6755,root,root) @libexecdir@/rdxport.cgi
%attr(6755,root,root) @libexecdir@/webget.cgi
@sysconfdir@/rd-bin.conf
@WIN32_PATH@
/etc/security/console.apps/rdalsaconfig-root
/etc/pam.d/rdalsaconfig-root
/etc/security/console.apps/rddbconfig-root

2
utils/rdcollect/Makefile.am
View File

@ -31,8 +31,6 @@ dist_rdcollect_SOURCES = rdcollect.cpp rdcollect.h
rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
EXTRA_DIST = rdcollect.pro
CLEANFILES = *~\
*.exe\
*.idb\

42
utils/rdcollect/rdcollect.pro
View File

@ -1,42 +0,0 @@
# rdcollect.pro
#
# The utils/rdcollect QMake project file for Rivendell
#
# (C) Copyright 2003-2007,2016 Fred Gleason <fredg@paravelsystems.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
TEMPLATE = app
TARGET = rdcollect
win32 {
DEFINES += WIN32
DEFINES += VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE=\"rivendell\"
DEFINES += PACKAGE_VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE_NAME=\"rivendell\"
DEFINES += PACKAGE_BUGREPORT=\"fredg@paravelsystems.com\"
}
SOURCES += rdcollect.cpp
HEADERS += rdcollect.h
RES_FILE += ..\..\icons\rivendell.res
INCLUDEPATH += ..\..\..\libradio\radio ..\..\lib
LIBS = -lqui -L..\..\..\libradio\radio -lradio -L..\..\lib -llib
CONFIG += qt

2
utils/rdsoftkeys/Makefile.am
View File

@ -33,8 +33,6 @@ nodist_rdsoftkeys_SOURCES = moc_rdsoftkeys.cpp
rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
EXTRA_DIST = rdsoftkeys.pro
CLEANFILES = *~\
*.exe\
*.idb\

42
utils/rdsoftkeys/rdsoftkeys.pro
View File

@ -1,42 +0,0 @@
# rdsoftkeys.pro
#
# The utils/rdsoftkeys QMake project file for Rivendell
#
# (C) Copyright 2003-2006,2016 Fred Gleason <fredg@paravelsystems.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
TEMPLATE = app
TARGET = rdsoftkeys
win32 {
DEFINES += WIN32
DEFINES += VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE=\"rivendell\"
DEFINES += PACKAGE_VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE_NAME=\"rivendell\"
DEFINES += PACKAGE_BUGREPORT=\"fredg@paravelsystems.com\"
}
SOURCES += rdsoftkeys.cpp
HEADERS += rdsoftkeys.h
RES_FILE += ..\..\icons\rivendell.res
INCLUDEPATH += ..\..\..\libradio\radio ..\..\lib
LIBS = -lqui -L..\..\..\libradio\radio -lradio -L..\..\lib -llib
CONFIG += qt

29
utils/rmlsend/rmlsend.pro
View File

@ -2,7 +2,7 @@
#
# The utils/ QMake project file for Rivendell
#
# (C) Copyright 2003-2007,2016 Fred Gleason <fredg@paravelsystems.com>
# (C) Copyright 2003-2018 Fred Gleason <fredg@paravelsystems.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
@ -17,30 +17,17 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
TEMPLATE = app
TARGET = rmlsend
win32 {
DEFINES += WIN32
DEFINES += VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE=\"rivendell\"
DEFINES += PACKAGE_VERSION=\"$$[VERSION]\"
DEFINES += PACKAGE_NAME=\"rivendell\"
DEFINES += PACKAGE_BUGREPORT=\"fredg@paravelsystems.com\"
}
#
# Maintainer's Note
#
# We don't use Qt's 'Qmake' build system, so the entries in here are
# purely for the sake of i18n support.
#
SOURCES += rmlsend.cpp
HEADERS += rmlsend.h
RES_FILE += ..\..\icons\rivendell.res
INCLUDEPATH += ..\..\..\libradio\radio ..\..\lib
LIBS = -lqui -L..\..\..\libradio\radio -lradio -L..\..\lib -llib
CONFIG += qt
TRANSLATIONS += rmlsend_cs.ts
TRANSLATIONS += rmlsend_de.ts
TRANSLATIONS += rmlsend_es.ts