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

2025-04-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Cleaned up compiler warnings in 'ripcd/'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2025-04-26 18:01:08 -04:00
parent cc43d5bc42
commit 345192b6cd
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -25006,3 +25006,5 @@
* Cleaned up compiler warnings in 'rdpanel/'. * Cleaned up compiler warnings in 'rdpanel/'.
2025-04-26 Fred Gleason <fredg@paravelsystems.com> 2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings in 'rdselect/'. * Cleaned up compiler warnings in 'rdselect/'.
2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings in 'ripcd/'.

8
ripcd/local_macros.cpp
View File

@ -2,7 +2,7 @@
// //
// Local RML Macros for the Rivendell Interprocess Communication Daemon // Local RML Macros for the Rivendell Interprocess Communication Daemon
// //
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -634,11 +634,11 @@ void MainObject::RunLocalMacros(RDMacro *rml_in)
} }
} }
} }
if(system(QString(). if(system(QString::asprintf("rdpopup -display %s %s %s",
sprintf("rdpopup -display %s %s %s",
rml.arg(0).toUtf8().constData(), rml.arg(0).toUtf8().constData(),
rml.arg(1).toUtf8().constData(), rml.arg(1).toUtf8().constData(),
RDEscapeString(rml.rollupArgs(2)).toUtf8().constData()).toUtf8().constData())<0) { RDEscapeString(rml.rollupArgs(2)).toUtf8().
constData()).toUtf8().constData())<0) {
rda->syslog(LOG_WARNING,"RDPopup returned an error"); rda->syslog(LOG_WARNING,"RDPopup returned an error");
} }
exit(0); exit(0);

10
ripcd/ripcd.cpp
View File

@ -2,7 +2,7 @@
// //
// Rivendell Interprocess Communication Daemon // Rivendell Interprocess Communication Daemon
// //
// (C) Copyright 2002-2023 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -242,7 +242,7 @@ void MainObject::newConnectionData()
void MainObject::notificationReceivedData(const QString &msg, void MainObject::notificationReceivedData(const QString &msg,
const QHostAddress &addr) const QHostAddress &addr)
{ {
QStringList f0=msg.split(" ",QString::SkipEmptyParts); QStringList f0=msg.split(" ",Qt::SkipEmptyParts);
if(f0.at(0)=="NOTIFY") { if(f0.at(0)=="NOTIFY") {
RDNotification *notify=new RDNotification(); RDNotification *notify=new RDNotification();
if(!notify->read(msg)) { if(!notify->read(msg)) {
@ -494,7 +494,7 @@ bool MainObject::DispatchCommand(RipcdConnection *conn)
QHostAddress addr; QHostAddress addr;
//printf("DispatchCommand(%s)\n",(const char *)conn->accum.toUtf8()); //printf("DispatchCommand(%s)\n",(const char *)conn->accum.toUtf8());
QStringList cmds=conn->accum.split(" ",QString::SkipEmptyParts); QStringList cmds=conn->accum.split(" ",Qt::SkipEmptyParts);
// //
// Common Commands // Common Commands
@ -632,7 +632,7 @@ bool MainObject::DispatchCommand(RipcdConnection *conn)
msg+=QString(cmds[i])+" "; msg+=QString(cmds[i])+" ";
} }
msg=msg.left(msg.length()-1); msg=msg.left(msg.length()-1);
QStringList f0=msg.split(" ",QString::SkipEmptyParts); QStringList f0=msg.split(" ",Qt::SkipEmptyParts);
if(f0.at(0)=="NOTIFY") { if(f0.at(0)=="NOTIFY") {
RDNotification *notify=new RDNotification(); RDNotification *notify=new RDNotification();
if(!notify->read(msg)) { if(!notify->read(msg)) {
@ -718,7 +718,7 @@ void MainObject::ReadRmlSocket(QUdpSocket *sock,RDMacro::Role role,
if(macro.command()==RDMacro::AG) { if(macro.command()==RDMacro::AG) {
if(ripc_onair_flag) { if(ripc_onair_flag) {
QStringList f0= QStringList f0=
QString::fromUtf8(buffer).split(" ",QString::SkipEmptyParts); QString::fromUtf8(buffer).split(" ",Qt::SkipEmptyParts);
f0.pop_front(); f0.pop_front();
QString rmlstr=f0.join(" "); QString rmlstr=f0.join(" ");
macro=RDMacro::fromString(rmlstr); macro=RDMacro::fromString(rmlstr);

6
ripcd/swauthority.cpp
View File

@ -2,7 +2,7 @@
// //
// A Rivendell switcher driver for systems using Software Authority Protocol // A Rivendell switcher driver for systems using Software Authority Protocol
// //
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -321,7 +321,7 @@ void SoftwareAuthority::DispatchCommand()
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);
return; return;
} }
f0=line_in.split("\t",QString::KeepEmptyParts); f0=line_in.split("\t",Qt::KeepEmptyParts);
// //
// Insert null zero or more '[null]' entries to cover holes // Insert null zero or more '[null]' entries to cover holes
@ -378,7 +378,7 @@ void SoftwareAuthority::DispatchCommand()
} }
return; return;
} }
f0=line_in.split("\t",QString::KeepEmptyParts); f0=line_in.split("\t",Qt::KeepEmptyParts);
// //
// Insert null zero or more '[null]' entries to cover holes // Insert null zero or more '[null]' entries to cover holes