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

2021-02-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the Qt3Support library from the build system.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-23 18:07:21 -05:00
parent b2f8532e25
commit 89a0d72439
508 changed files with 5763 additions and 6078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/rdclilogedit/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2016-2020 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2016-2021 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,7 +17,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -34,7 +34,7 @@ dist_rdclilogedit_SOURCES = help.cpp\
nodist_rdclilogedit_SOURCES = moc_rdclilogedit.cpp
rdclilogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
rdclilogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
CLEANFILES = *~\
*.idb\

8
utils/rdclilogedit/help.cpp
View File

@@ -2,7 +2,7 @@
//
// A command-line log editor for Rivendell
//
// (C) Copyright 2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2021 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
@@ -37,7 +37,7 @@ void MainObject::Help(const QStringList &cmds) const
processed=true;
}
else {
QString verb=cmds[1].lower();
QString verb=cmds[1].toLower();
if(verb=="addcart") {
printf("\n");
printf(" addcart <line> <cart-num>\n");
@@ -72,7 +72,7 @@ void MainObject::Help(const QStringList &cmds) const
}
if((verb=="bye")||(verb=="exit")||(verb=="quit")) {
printf("\n");
printf(" %s\n",(const char *)cmds[1]);
printf(" %s\n",cmds[1].toUtf8().constData());
printf("\n");
printf("Exit the program.\n");
printf("\n");
@@ -88,7 +88,7 @@ void MainObject::Help(const QStringList &cmds) const
}
if((verb=="?")||(verb=="help")) {
printf("\n");
printf(" %s <cmd-name>\n",(const char *)cmds[1]);
printf(" %s <cmd-name>\n",cmds[1].toUtf8().constData());
printf("\n");
printf("Print help about command <cmd-name>\n");
printf("\n");

38
utils/rdclilogedit/operations.cpp
View File

@@ -2,7 +2,7 @@
//
// A command-line log editor for Rivendell
//
// (C) Copyright 2016-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2021 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
@@ -137,8 +137,8 @@ void MainObject::Deletelog(QString logname)
void MainObject::Header() const
{
printf(" Description: %s\n",(const char *)edit_description);
printf(" Service: %s\n",(const char *)edit_service);
printf(" Description: %s\n",edit_description.toUtf8().constData());
printf(" Service: %s\n",edit_service.toUtf8().constData());
if(edit_auto_refresh) {
printf("Auto Refresh: Yes\n");
}
@@ -150,21 +150,21 @@ void MainObject::Header() const
}
else {
printf(" Start Date: %s\n",
(const char *)edit_start_date.toString("yyyy-MM-dd"));
edit_start_date.toString("yyyy-MM-dd").toUtf8().constData());
}
if(edit_end_date.isNull()) {
printf(" End Date: None\n");
}
else {
printf(" End Date: %s\n",
(const char *)edit_end_date.toString("yyyy-MM-dd"));
edit_end_date.toString("yyyy-MM-dd").toUtf8().constData());
}
if(edit_purge_date.isNull()) {
printf(" Purge Date: None\n");
}
else {
printf(" Purge Date: %s\n",
(const char *)edit_purge_date.toString("yyyy-MM-dd"));
edit_purge_date.toString("yyyy-MM-dd").toUtf8().constData());
}
}
@@ -172,7 +172,7 @@ void MainObject::Header() const
void MainObject::List()
{
for(int i=0;i<edit_log_model->lineCount();i++) {
printf("%4d %s\n",i,(const char *)ListLine(edit_log_model,i));
printf("%4d %s\n",i,ListLine(edit_log_model,i).toUtf8().constData());
}
printf("%4d --- end of log ---\n",edit_log_model->lineCount());
}
@@ -186,7 +186,7 @@ void MainObject::ListLogs() const
sql=QString("select NAME from LOGS order by NAME");
q=new RDSqlQuery(sql);
while(q->next()) {
printf("%s\n",(const char *)q->value(0).toString());
printf("%s\n",q->value(0).toString().toUtf8().constData());
}
delete q;
}
@@ -200,7 +200,7 @@ void MainObject::Listservices() const
sql=QString("select NAME from SERVICES order by NAME");
q=new RDSqlQuery(sql);
while(q->next()) {
printf("%s\n",(const char *)q->value(0).toString());
printf("%s\n",q->value(0).toString().toUtf8().constData());
}
delete q;
}
@@ -261,7 +261,7 @@ void MainObject::Load(QString logname)
edit_modified=false;
}
else {
fprintf(stderr,"log \"%s\" does not exist\n",(const char *)logname);
fprintf(stderr,"log \"%s\" does not exist\n",logname.toUtf8().constData());
delete edit_log;
edit_log=NULL;
}
@@ -276,29 +276,29 @@ QString MainObject::ListLine(RDLogModel *model,int line) const
switch(logline->timeType()) {
case RDLogLine::Hard:
ret+=QString().
sprintf("T%s ",(const char *)logline->startTime(RDLogLine::Logged).
toString("hh:mm:ss"));
sprintf("T%s ",logline->startTime(RDLogLine::Logged).
toString("hh:mm:ss").toUtf8().constData());
break;
case RDLogLine::Relative:
ret+=QString().
sprintf(" %s ",(const char *)model->blockStartTime(line).
toString("hh:mm:ss"));
sprintf(" %s ",model->blockStartTime(line).
toString("hh:mm:ss").toUtf8().constData());
break;
case RDLogLine::NoTime:
ret+=" ";
break;
}
ret+=QString().sprintf("%-7s",
(const char *)RDLogLine::transText(logline->transType()));
ret+=QString().sprintf("%-7s",RDLogLine::transText(logline->transType()).
toUtf8().constData());
switch(logline->type()) {
case RDLogLine::Cart:
case RDLogLine::Macro:
ret+=QString().sprintf("%06u ",logline->cartNumber());
ret+=QString().sprintf("%-12s",(const char *)logline->groupName());
ret+=QString().sprintf("%5s",
(const char *)RDGetTimeLength(logline->forcedLength(),false,false))+" ";
ret+=QString().sprintf("%-12s",logline->groupName().toUtf8().constData());
ret+=QString().sprintf("%5s",RDGetTimeLength(logline->forcedLength(),false,
false).toUtf8().constData())+" ";
ret+=logline->title();
break;

29
utils/rdclilogedit/parser.cpp
View File

@@ -2,7 +2,7 @@
//
// A command-line log editor for Rivendell
//
// (C) Copyright 2016-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2021 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
@@ -18,11 +18,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <rdapplication.h>
#include <rdweb.h>
#include <rddatetime.h>
#include "rdclilogedit.h"
@@ -37,13 +34,13 @@ void MainObject::DispatchCommand(QString cmd)
QStringList cmds;
QString verb;
cmd=cmd.stripWhiteSpace();
cmd=cmd.trimmed();
if(cmd.right(1)=="!") {
overwrite=true;
cmd=cmd.left(cmd.length()-1).stripWhiteSpace();
cmd=cmd.left(cmd.length()-1).trimmed();
}
cmds=cmd.split(" ",QString::SkipEmptyParts);
verb=cmds[0].lower();
verb=cmds[0].toLower();
//
// No loaded log needed for these
@@ -278,7 +275,7 @@ void MainObject::DispatchCommand(QString cmd)
if(verb=="setautorefresh") {
if(rda->user()->arrangeLog()) {
if(cmds.size()==2) {
QString arg=cmds[1].lower();
QString arg=cmds[1].toLower();
if((arg=="yes")||(arg=="true")||(arg=="y")) {
Setautorefresh(true);
processed=true;
@@ -335,8 +332,8 @@ void MainObject::DispatchCommand(QString cmd)
if(cmds.size()>=3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
cmds.remove(cmds.begin());
cmds.remove(cmds.begin());
cmds.removeFirst();
cmds.removeFirst();
Setcomment(line,cmds.join(" "));
}
else {
@@ -496,10 +493,10 @@ void MainObject::DispatchCommand(QString cmd)
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
RDLogLine::TimeType ttype=RDLogLine::NoTime;
if(cmds[2].lower()=="hard") {
if(cmds[2].toLower()=="hard") {
ttype=RDLogLine::Hard;
}
if(cmds[2].lower()=="none") {
if(cmds[2].toLower()=="none") {
ttype=RDLogLine::Relative;
}
switch(ttype) {
@@ -548,13 +545,13 @@ void MainObject::DispatchCommand(QString cmd)
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
RDLogLine::TransType trans=RDLogLine::NoTrans;
if(cmds[2].lower()=="play") {
if(cmds[2].toLower()=="play") {
trans=RDLogLine::Play;
}
if(cmds[2].lower()=="segue") {
if(cmds[2].toLower()=="segue") {
trans=RDLogLine::Segue;
}
if(cmds[2].lower()=="stop") {
if(cmds[2].toLower()=="stop") {
trans=RDLogLine::Stop;
}
if(trans!=RDLogLine::NoTrans) {
@@ -590,7 +587,7 @@ void MainObject::DispatchCommand(QString cmd)
}
}
else {
fprintf(stderr,"%s: no log loaded\n",(const char *)verb);
fprintf(stderr,"%s: no log loaded\n",verb.toUtf8().constData());
processed=true;
}

18
utils/rdclilogedit/rdclilogedit.cpp
View File

@@ -2,7 +2,7 @@
//
// A command-line log editor for Rivendell
//
// (C) Copyright 2016-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2021 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
@@ -24,9 +24,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <qapplication.h>
#include <qfile.h>
#include <qstringlist.h>
#include <QApplication>
#include <rdapplication.h>
#include <rdconf.h>
@@ -52,7 +50,7 @@ MainObject::MainObject(QObject *parent)
//
rda=static_cast<RDApplication *>(new RDCoreApplication("rdclilogedit","rdclilogedit",RDCLILOGEDIT_USAGE,this));
if(!rda->open(&err_msg)) {
fprintf(stderr,"rdclilogedit: %s\n",(const char *)err_msg);
fprintf(stderr,"rdclilogedit: %s\n",err_msg.toUtf8().constData());
exit(1);
}
@@ -67,7 +65,7 @@ MainObject::MainObject(QObject *parent)
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"rdclilogedit: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(2);
}
}
@@ -135,7 +133,7 @@ bool MainObject::TryLock(RDLogLock *lock,const QString &logname)
if(stationname!=addr.toString()) {
msg+=" ["+addr.toString()+"]";
}
fprintf(stderr,"%s\n",(const char *)msg);
fprintf(stderr,"%s\n",msg.toUtf8().constData());
}
return ret;
}
@@ -144,7 +142,7 @@ bool MainObject::TryLock(RDLogLock *lock,const QString &logname)
void MainObject::OverwriteError(const QString &cmd) const
{
fprintf(stderr,"%s: buffer not saved (append \"!\" to override)\n",
(const char *)cmd);
cmd.toUtf8().constData());
}
@@ -156,10 +154,10 @@ void MainObject::PrintPrompt() const
}
else {
if(edit_modified) {
printf("logedit[%s*]> ",(const char *)edit_log->name());
printf("logedit[%s*]> ",edit_log->name().toUtf8().constData());
}
else {
printf("logedit[%s]> ",(const char *)edit_log->name());
printf("logedit[%s]> ",edit_log->name().toUtf8().constData());
}
}
fflush(stdout);