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

2020-12-27 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'RDLogEvent' class.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-12-27 17:20:58 -05:00
parent b72b9f08c2
commit ca7ead3ea3
37 changed files with 357 additions and 2231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
utils/rdclilogedit/operations.cpp
View File

@@ -2,7 +2,7 @@
//
// A command-line log editor for Rivendell
//
// (C) Copyright 2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2020 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
@@ -27,62 +27,62 @@
void MainObject::Addcart(int line,unsigned cartnum)
{
if(line>edit_log_event->size()) {
line=edit_log_event->size();
if(line>edit_log_model->lineCount()) {
line=edit_log_model->lineCount();
}
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->
edit_log_model->insert(line,1);
edit_log_model->logLine(line)->
setTransType(rda->airplayConf()->defaultTransType());
edit_log_event->logLine(line)->setFadeupGain(-3000);
edit_log_event->logLine(line)->setFadedownGain(-3000);
edit_log_event->logLine(line)->setCartNumber(cartnum);
edit_log_event->refresh(line);
edit_log_model->logLine(line)->setFadeupGain(-3000);
edit_log_model->logLine(line)->setFadedownGain(-3000);
edit_log_model->logLine(line)->setCartNumber(cartnum);
edit_log_model->refresh(line);
edit_modified=true;
}
void MainObject::Addchain(int line,const QString &logname)
{
if(line>edit_log_event->size()) {
line=edit_log_event->size();
if(line>edit_log_model->lineCount()) {
line=edit_log_model->lineCount();
}
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Chain);
edit_log_event->logLine(line)->
edit_log_model->insert(line,1);
edit_log_model->logLine(line)->setType(RDLogLine::Chain);
edit_log_model->logLine(line)->
setTransType(rda->airplayConf()->defaultTransType());
edit_log_event->logLine(line)->setMarkerLabel(logname);
edit_log_event->refresh(line);
edit_log_model->logLine(line)->setMarkerLabel(logname);
edit_log_model->refresh(line);
edit_modified=true;
}
void MainObject::Addmarker(int line)
{
if(line>edit_log_event->size()) {
line=edit_log_event->size();
if(line>edit_log_model->lineCount()) {
line=edit_log_model->lineCount();
}
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Marker);
edit_log_event->logLine(line)->
edit_log_model->insert(line,1);
edit_log_model->logLine(line)->setType(RDLogLine::Marker);
edit_log_model->logLine(line)->
setTransType(rda->airplayConf()->defaultTransType());
edit_log_event->logLine(line)->setMarkerLabel(tr("Label"));
edit_log_event->logLine(line)->setMarkerComment(tr("Marker Comment"));
edit_log_event->refresh(line);
edit_log_model->logLine(line)->setMarkerLabel(tr("Label"));
edit_log_model->logLine(line)->setMarkerComment(tr("Marker Comment"));
edit_log_model->refresh(line);
edit_modified=true;
}
void MainObject::Addtrack(int line)
{
if(line>edit_log_event->size()) {
line=edit_log_event->size();
if(line>edit_log_model->lineCount()) {
line=edit_log_model->lineCount();
}
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setType(RDLogLine::Track);
edit_log_event->logLine(line)->
edit_log_model->insert(line,1);
edit_log_model->logLine(line)->setType(RDLogLine::Track);
edit_log_model->logLine(line)->
setTransType(rda->airplayConf()->defaultTransType());
edit_log_event->logLine(line)->setMarkerComment(tr("Voice Track"));
edit_log_event->refresh(line);
edit_log_model->logLine(line)->setMarkerComment(tr("Voice Track"));
edit_log_model->refresh(line);
edit_modified=true;
}
@@ -171,10 +171,10 @@ void MainObject::Header() const
void MainObject::List()
{
for(int i=0;i<edit_log_event->size();i++) {
printf("%4d %s\n",i,(const char *)ListLine(edit_log_event,i));
for(int i=0;i<edit_log_model->lineCount();i++) {
printf("%4d %s\n",i,(const char *)ListLine(edit_log_model,i));
}
printf("%4d --- end of log ---\n",edit_log_event->size());
printf("%4d --- end of log ---\n",edit_log_model->lineCount());
}
@@ -215,9 +215,9 @@ void MainObject::Load(QString logname)
delete edit_log;
edit_log=NULL;
}
if(edit_log_event!=NULL) {
delete edit_log_event;
edit_log_event=NULL;
if(edit_log_model!=NULL) {
delete edit_log_model;
edit_log_model=NULL;
}
if(edit_log_lock!=NULL) {
delete edit_log_lock;
@@ -250,8 +250,8 @@ void MainObject::Load(QString logname)
edit_log=new RDLog(logname);
if(edit_log->exists()) {
edit_log_event=new RDLogEvent(logname);
edit_log_event->load();
edit_log_model=new RDLogModel(logname,false,this);
edit_log_model->load();
edit_description=edit_log->description();
edit_service=edit_log->service();
edit_start_date=edit_log->startDate();
@@ -268,10 +268,10 @@ void MainObject::Load(QString logname)
}
QString MainObject::ListLine(RDLogEvent *evt,int line) const
QString MainObject::ListLine(RDLogModel *model,int line) const
{
QString ret="";
RDLogLine *logline=evt->logLine(line);
RDLogLine *logline=model->logLine(line);
switch(logline->timeType()) {
case RDLogLine::Hard:
@@ -282,7 +282,7 @@ QString MainObject::ListLine(RDLogEvent *evt,int line) const
case RDLogLine::Relative:
ret+=QString().
sprintf(" %s ",(const char *)evt->blockStartTime(line).
sprintf(" %s ",(const char *)model->blockStartTime(line).
toString("hh:mm:ss"));
break;
@@ -354,15 +354,15 @@ void MainObject::New(const QString &logname)
if(edit_log!=NULL) {
delete edit_log;
}
if(edit_log_event!=NULL) {
delete edit_log_event;
if(edit_log_model!=NULL) {
delete edit_log_model;
}
if(edit_log_lock!=NULL) {
delete edit_log_lock;
}
edit_log=new RDLog(logname);
if(!edit_log->exists()) {
edit_log_event=new RDLogEvent(logname);
edit_log_model=new RDLogModel(logname,false,this);
edit_description=logname+" log";
sql=QString("select NAME from SERVICES");
q=new RDSqlQuery(sql);
@@ -391,14 +391,14 @@ void MainObject::New(const QString &logname)
void MainObject::Remove(int line)
{
edit_log_event->remove(line,1);
edit_log_model->remove(line,1);
edit_modified=true;
}
void MainObject::Save()
{
edit_log_event->save(rda->config());
edit_log_model->save(rda->config());
edit_log->setDescription(edit_description);
edit_log->setStartDate(edit_start_date);
edit_log->setEndDate(edit_end_date);
@@ -434,8 +434,8 @@ void MainObject::Saveas(const QString &logname)
"SERVICE=\""+RDEscapeString(edit_service)+"\"";
q=new RDSqlQuery(sql);
delete q;
edit_log_event->setLogName(logname);
edit_log_event->save(rda->config());
edit_log_model->setLogName(logname);
edit_log_model->save(rda->config());
delete edit_log;
edit_log=log;
edit_modified=false;
@@ -457,12 +457,12 @@ void MainObject::Setautorefresh(bool state)
void MainObject::Setcart(int line,unsigned cartnum)
{
RDLogLine *logline=edit_log_event->logLine(line);
RDLogLine *logline=edit_log_model->logLine(line);
if(logline!=NULL) {
if((logline->type()==RDLogLine::Cart)||
(logline->type()==RDLogLine::Macro)) {
logline->setCartNumber(cartnum);
edit_log_event->refresh(line);
edit_log_model->refresh(line);
edit_modified=true;
}
else {
@@ -477,12 +477,12 @@ void MainObject::Setcart(int line,unsigned cartnum)
void MainObject::Setcomment(int line,const QString &str)
{
RDLogLine *logline=edit_log_event->logLine(line);
RDLogLine *logline=edit_log_model->logLine(line);
if(logline!=NULL) {
if((logline->type()==RDLogLine::Marker)||
(logline->type()==RDLogLine::Track)) {
logline->setMarkerComment(str);
edit_log_event->refresh(line);
edit_log_model->refresh(line);
edit_modified=true;
}
else {
@@ -511,12 +511,12 @@ void MainObject::Setenddate(const QDate &date)
void MainObject::Setlabel(int line,const QString &str)
{
RDLogLine *logline=edit_log_event->logLine(line);
RDLogLine *logline=edit_log_model->logLine(line);
if(logline!=NULL) {
if((logline->type()==RDLogLine::Chain)||
(logline->type()==RDLogLine::Marker)) {
logline->setMarkerLabel(str);
edit_log_event->refresh(line);
edit_log_model->refresh(line);
edit_modified=true;
}
else {
@@ -553,16 +553,16 @@ void MainObject::Setservice(const QString &str)
void MainObject::Settime(int line,RDLogLine::TimeType type,const QTime &time)
{
edit_log_event->logLine(line)->setTimeType(type);
edit_log_event->logLine(line)->setStartTime(RDLogLine::Logged,time);
edit_log_model->logLine(line)->setTimeType(type);
edit_log_model->logLine(line)->setStartTime(RDLogLine::Logged,time);
edit_modified=true;
}
void MainObject::Settrans(int line,RDLogLine::TransType type)
{
edit_log_event->logLine(line)->setTransType(type);
edit_log_event->refresh(line);
edit_log_model->logLine(line)->setTransType(type);
edit_log_model->refresh(line);
edit_modified=true;
}
@@ -580,9 +580,9 @@ void MainObject::Unload()
delete edit_log;
edit_log=NULL;
}
if(edit_log_event!=NULL) {
delete edit_log_event;
edit_log_event=NULL;
if(edit_log_model!=NULL) {
delete edit_log_model;
edit_log_model=NULL;
}
if(edit_log_lock!=NULL) {
delete edit_log_lock;

16
utils/rdclilogedit/parser.cpp
View File

@@ -2,7 +2,7 @@
//
// A command-line log editor for Rivendell
//
// (C) Copyright 2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2020 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
@@ -124,7 +124,7 @@ void MainObject::DispatchCommand(QString cmd)
//
// These need a log loaded
//
if((processed)||(edit_log_event!=NULL)) {
if((processed)||(edit_log_model!=NULL)) {
if(verb=="addcart") {
if(rda->user()->addtoLog()) {
if(cmds.size()==3) {
@@ -229,7 +229,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->removefromLog()) {
if(cmds.size()==2) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
Remove(line);
}
else {
@@ -306,7 +306,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->arrangeLog()) {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
unsigned cartnum=cmds[2].toUInt(&ok);
if(ok&&(cartnum<=RD_MAX_CART_NUMBER)) {
Setcart(line,cartnum);
@@ -334,7 +334,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->arrangeLog()) {
if(cmds.size()>=3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
cmds.remove(cmds.begin());
cmds.remove(cmds.begin());
Setcomment(line,cmds.join(" "));
@@ -402,7 +402,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->arrangeLog()) {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
Setlabel(line,cmds[2]);
}
else {
@@ -494,7 +494,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->arrangeLog()) {
if(cmds.size()>=3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
RDLogLine::TimeType ttype=RDLogLine::NoTime;
if(cmds[2].lower()=="hard") {
ttype=RDLogLine::Hard;
@@ -546,7 +546,7 @@ void MainObject::DispatchCommand(QString cmd)
if(rda->user()->arrangeLog()) {
if(cmds.size()==3) {
line=cmds[1].toInt(&ok);
if(ok&&(line>=0)&&(line<edit_log_event->size())) {
if(ok&&(line>=0)&&(line<edit_log_model->lineCount())) {
RDLogLine::TransType trans=RDLogLine::NoTrans;
if(cmds[2].lower()=="play") {
trans=RDLogLine::Play;

4
utils/rdclilogedit/rdclilogedit.cpp
View File

@@ -2,7 +2,7 @@
//
// A command-line log editor for Rivendell
//
// (C) Copyright 2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2020 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
@@ -43,7 +43,7 @@ MainObject::MainObject(QObject *parent)
edit_quiet_option=false;
edit_log=NULL;
edit_log_event=NULL;
edit_log_model=NULL;
edit_modified=false;
edit_log_lock=NULL;

7
utils/rdclilogedit/rdclilogedit.h
View File

@@ -2,7 +2,7 @@
//
// A Command-line log editor for Rivendell
//
// (C) Copyright 2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2020 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
@@ -26,7 +26,6 @@
#include <rdcut.h>
#include <rddb.h>
#include <rdlog.h>
#include <rdlog_event.h>
#include <rdloglock.h>
#include <rdnotification.h>
@@ -72,14 +71,14 @@ class MainObject : public QObject
bool TryLock(RDLogLock *lock,const QString &logname);
void OverwriteError(const QString &cmd) const;
void DispatchCommand(QString cmd);
QString ListLine(RDLogEvent *evt,int line) const;
QString ListLine(RDLogModel *model,int line) const;
void PrintPrompt() const;
void SendNotification(RDNotification::Action action,const QString &logname);
bool edit_quiet_option;
QString edit_accum;
bool edit_modified;
RDLog *edit_log;
RDLogEvent *edit_log_event;
RDLogModel *edit_log_model;
QString edit_description;
QString edit_service;
QDate edit_start_date;