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

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

Browse Source 
* Converted rdlogedit(1) to use RDApplication.
This commit is contained in:
Fred Gleason 2018-01-31 00:07:58 -05:00
parent f46ee15dad
commit 0adc505ffa
16 changed files with 163 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -16607,3 +16607,5 @@
* Converted rdcastmanager(1) to use RDApplication.
2018-01-31 Fred Gleason <fredg@paravelsystems.com>
* Converted rdcatch(1) to use RDApplication.
2018-01-31 Fred Gleason <fredg@paravelsystems.com>
* Converted rdlogedit(1) to use RDApplication.

11
lib/rdapplication.cpp
View File

@ -38,6 +38,7 @@ RDApplication::RDApplication(const QString &module_name,QObject *parent)
app_cae=NULL;
app_config=NULL;
app_library_conf=NULL;
app_logedit_conf=NULL;
app_panel_conf=NULL;
app_ripc=NULL;
app_station=NULL;
@ -60,6 +61,9 @@ RDApplication::~RDApplication()
if(app_library_conf!=NULL) {
delete app_library_conf;
}
if(app_logedit_conf!=NULL) {
delete app_logedit_conf;
}
if(app_airplay_conf!=NULL) {
delete app_airplay_conf;
}
@ -125,6 +129,7 @@ bool RDApplication::open(QString *err_msg)
app_system=new RDSystem();
app_station=new RDStation(app_config->stationName());
app_library_conf=new RDLibraryConf(app_config->stationName());
app_logedit_conf=new RDLogeditConf(app_config->stationName());
app_airplay_conf=new RDAirPlayConf(app_config->stationName(),"RDAIRPLAY");
app_panel_conf=new RDAirPlayConf(app_config->stationName(),"RDPANEL");
app_user=new RDUser();
@ -159,6 +164,12 @@ RDLibraryConf *RDApplication::libraryConf()
}
RDLogeditConf *RDApplication::logeditConf()
{
return app_logedit_conf;
}
RDAirPlayConf *RDApplication::panelConf()
{
return app_panel_conf;

3
lib/rdapplication.h
View File

@ -28,6 +28,7 @@
#include <rdconfig.h>
#include <rddb.h>
#include <rdlibrary_conf.h>
#include <rdlogedit_conf.h>
#include <rdripc.h>
#include <rdstation.h>
#include <rdsystem.h>
@ -44,6 +45,7 @@ class RDApplication : public QObject
RDCae *cae();
RDConfig *config();
RDLibraryConf *libraryConf();
RDLogeditConf *logeditConf();
RDAirPlayConf *panelConf();
RDRipc *ripc();
RDStation *station();
@ -56,6 +58,7 @@ class RDApplication : public QObject
RDCae *app_cae;
RDConfig *app_config;
RDLibraryConf *app_library_conf;
RDLogeditConf *app_logedit_conf;
RDRipc *app_ripc;
RDStation *app_station;
RDSystem *app_system;

5
rdlogedit/edit_chain.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Log Chain Entry
//
// (C) Copyright 2002-2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@ -21,6 +21,7 @@
#include <qpushbutton.h>
#include <qmessagebox.h>
#include <rdapplication.h>
#include <rddb.h>
#include <rdlist_logs.h>
@ -290,7 +291,7 @@ void EditChain::selectLogData()
QString logname;
RDListLogs *d=
new RDListLogs(&logname,RDLogFilter::UserFilter,rduser,log_config,this);
new RDListLogs(&logname,RDLogFilter::UserFilter,rda->user(),rda->config(),this);
if(d->exec()!=0) {
delete d;
return;

61
rdlogedit/edit_log.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Log
//
// (C) Copyright 2002-2017 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@ -30,24 +30,25 @@
#include <qmessagebox.h>
#include <qbuttongroup.h>
#include <rddb.h>
#include <rdcreate_log.h>
#include <rddebug.h>
#include <rdadd_log.h>
#include <rdtextvalidator.h>
#include <rdtextfile.h>
#include <rdlogedit_conf.h>
#include <rd.h>
#include <rdadd_log.h>
#include <rdapplication.h>
#include <rdconf.h>
#include <rdcreate_log.h>
#include <rddatedialog.h>
#include <rddb.h>
#include <rddebug.h>
#include <rdlogedit_conf.h>
#include <rdtextfile.h>
#include <rdtextvalidator.h>
#include "globals.h"
#include "add_meta.h"
#include "edit_chain.h"
#include "edit_log.h"
#include "edit_logline.h"
#include "edit_marker.h"
#include "edit_track.h"
#include "globals.h"
//
// Icons
@ -80,21 +81,21 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
edit_clipboard=clipboard;
edit_newlogs=new_logs;
edit_default_trans=RDLogLine::Play;
bool adding_allowed=rduser->addtoLog();
bool deleting_allowed=rduser->removefromLog();
bool editing_allowed=rduser->arrangeLog();
bool saveas_allowed=rduser->createLog();
bool adding_allowed=rda->user()->addtoLog();
bool deleting_allowed=rda->user()->removefromLog();
bool editing_allowed=rda->user()->arrangeLog();
bool saveas_allowed=rda->user()->createLog();
setCaption(tr("Edit Log"));
//
// Config Data
//
edit_default_trans=rdlogedit_conf->defaultTransType();
edit_output_card=rdlogedit_conf->outputCard();
edit_output_port=rdlogedit_conf->outputPort();
edit_start_macro=rdlogedit_conf->startCart();
edit_end_macro=rdlogedit_conf->endCart();
edit_default_trans=rda->logeditConf()->defaultTransType();
edit_output_card=rda->logeditConf()->outputCard();
edit_output_port=rda->logeditConf()->outputPort();
edit_start_macro=rda->logeditConf()->startCart();
edit_end_macro=rda->logeditConf()->endCart();
//
// Fix the Window Size
@ -133,7 +134,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
// Dialogs
//
#ifndef WIN32
edit_render_dialog=new RenderDialog(rdstation_conf,rdsystem,log_config,this);
edit_render_dialog=new RenderDialog(rda->station(),rda->system(),rda->config(),this);
#endif // WIN32
//
@ -149,7 +150,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
//
// Log Data Structures
//
edit_log_lock=new RDLogLock(edit_logname,rduser,rdstation_conf,this);
edit_log_lock=new RDLogLock(edit_logname,rda->user(),rda->station(),this);
edit_log_event=new RDLogEvent(RDLog::tableName(edit_logname));
edit_log_event->load(true);
@ -493,7 +494,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
edit_player=NULL;
#else
edit_player=
new RDSimplePlayer(rdcae,rdripc,edit_output_card,edit_output_port,
new RDSimplePlayer(rda->cae(),rda->ripc(),edit_output_card,edit_output_port,
edit_start_macro,edit_end_macro,this);
edit_player->stopButton()->setOnColor(red);
#endif // WIN32
@ -1115,20 +1116,20 @@ void EditLog::saveasData()
RDAddLog *log=NULL;
QString err_msg;
if(rduser->createLog()) {
log=new RDAddLog(&logname,&svcname,RDLogFilter::UserFilter,rduser,
rdstation_conf,tr("Add Log"),this);
if(rda->user()->createLog()) {
log=new RDAddLog(&logname,&svcname,RDLogFilter::UserFilter,rda->user(),
rda->station(),tr("Add Log"),this);
if(log->exec()<0) {
return;
}
if(!RDLog::create(logname,svcname,rdripc->user(),&err_msg,log_config)) {
if(!RDLog::create(logname,svcname,rda->ripc()->user(),&err_msg,rda->config())) {
QMessageBox::warning(this,"RDLogEdit - "+tr("Error"),err_msg);
return;
}
delete edit_log;
edit_newlogs->push_back(logname);
edit_log=new RDLog(logname);
RDCreateLogTable(RDLog::tableName(logname),log_config);
RDCreateLogTable(RDLog::tableName(logname),rda->config());
edit_log_event->setLogName(RDLog::tableName(logname));
for(int i=0;i<edit_service_box->count();i++) {
if(edit_service_box->text(i)==svcname) {
@ -1167,10 +1168,10 @@ void EditLog::renderasData()
next=next->nextSibling();
}
if(first_line<0) {
edit_render_dialog->exec(rduser,edit_log_event,0,0);
edit_render_dialog->exec(rda->user(),edit_log_event,0,0);
}
else {
edit_render_dialog->exec(rduser,edit_log_event,first_line,last_line+1);
edit_render_dialog->exec(rda->user(),edit_log_event,first_line,last_line+1);
}
#endif // WIN32
}
@ -1395,7 +1396,7 @@ void EditLog::SaveLog()
edit_log->setEndDate(QDate());
}
edit_log->setAutoRefresh(edit_autorefresh_box->currentItem()==0);
edit_log_event->save(log_config);
edit_log_event->save(rda->config());
edit_log->
setModifiedDatetime(QDateTime(QDate::currentDate(),QTime::currentTime()));
}
@ -1818,7 +1819,7 @@ bool EditLog::DeleteTracks()
RDCart *cart;
for(unsigned i=0;i<edit_deleted_tracks.size();i++) {
cart=new RDCart(edit_deleted_tracks[i]);
if(!cart->remove(rdstation_conf,rduser,log_config)) {
if(!cart->remove(rda->station(),rda->user(),rda->config())) {
delete cart;
return false;
}

17
rdlogedit/edit_logline.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Log Entry
//
// (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2004,2016-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
@ -23,11 +23,12 @@
#include <qradiobutton.h>
#include <rd.h>
#include <rdapplication.h>
#include <rdcart.h>
#include <rdcart_dialog.h>
#include <globals.h>
#include <edit_logline.h>
#include "edit_logline.h"
#include "globals.h"
EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group,
QString *schedcode,QString svcname,
@ -76,12 +77,12 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group,
log_config,this);
*/
edit_cart_dialog=new RDCartDialog(edit_filter,edit_group,edit_schedcode,
NULL,NULL,rdstation_conf,rdsystem,
log_config,this);
NULL,NULL,rda->station(),rda->system(),
rda->config(),this);
#else
edit_cart_dialog=new RDCartDialog(edit_filter,edit_group,edit_schedcode,
rdcae,rdripc,rdstation_conf,rdsystem,
log_config,this);
rda->cae(),rda->ripc(),rda->station(),rda->system(),
rda->config(),this);
#endif
//
@ -290,7 +291,7 @@ void EditLogLine::selectCartData()
cartnum=-1;
}
if(edit_cart_dialog->exec(&cartnum,RDCart::All,&edit_service,1,
rduser->name(),rduser->password())==0) {
rda->user()->name(),rda->user()->password())==0) {
FillCart(cartnum);
}
}

22
rdlogedit/globals.h
View File

@ -2,7 +2,7 @@
//
// Global Variable Declarations for RDLogEdit
//
// (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2004,2016-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
@ -21,28 +21,10 @@
#ifndef GLOBALS_H
#define GLOBALS_H
#include <rdstation.h>
#include <rduser.h>
#include <rdripc.h>
#include <rdconfig.h>
#include <rdsystem.h>
#include <rdlogedit_conf.h>
#ifndef WIN32
#include <rdcae.h>
#endif // WIN32
//
// Global Resources
//
extern RDStation *rdstation_conf;
extern RDUser *rduser;
extern RDRipc *rdripc;
extern RDConfig *log_config;
extern RDLogeditConf *rdlogedit_conf;
extern bool import_running;
extern RDSystem *rdsystem;
#ifndef WIN32
extern RDCae *rdcae;
#endif // WIN32
#endif // GLOBALS_H

128
rdlogedit/rdlogedit.cpp
View File

@ -2,7 +2,7 @@
//
// The Log Editor Utility for Rivendell.
//
// (C) Copyright 2002-2017 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@ -43,6 +43,7 @@
#include <dbversion.h>
#include <rd.h>
#include <rdadd_log.h>
#include <rdapplication.h>
#include <rdcheck_daemons.h>
#include <rdcmd_switch.h>
#include <rdconf.h>
@ -50,7 +51,6 @@
#include <rdescape_string.h>
#include <rdloglock.h>
#include <rdmixer.h>
#include <rdripc.h>
#include <rdstation.h>
#include <rdtextfile.h>
@ -74,17 +74,9 @@
//
// Global Resources
//
RDStation *rdstation_conf;
RDUser *rduser;
RDRipc *rdripc;
RDConfig *log_config;
RDLogeditConf *rdlogedit_conf;
RDSystem *rdsystem;
RDCartDialog *log_cart_dialog;
bool import_running=false;
#ifndef WIN32
RDCae *rdcae;
void SigHandler(int signo)
{
@ -110,19 +102,14 @@ MainWidget::MainWidget(QWidget *parent)
QString str1;
QString str2;
log_log_list=NULL;
bool skip_db_check=false;
unsigned schema=0;
/*
QString sql;
RDSqlQuery *q;
*/
QString err_msg;
//
// Read Command Options
//
RDCmdSwitch *cmd=new RDCmdSwitch(qApp->argc(),qApp->argv(),"rdlogedit","\n");
for(unsigned i=0;i<cmd->keys();i++) {
if(cmd->key(i)=="--skip-db-check") {
skip_db_check=true;
}
}
delete cmd;
@ -140,71 +127,31 @@ MainWidget::MainWidget(QWidget *parent)
RDInitializeDaemons();
#endif // WIN32
//
// Load Local Configs
//
log_config=new RDConfig();
log_config->load();
log_config->setModuleName("RDLogEdit");
rda=new RDApplication("RDLogEdit",this);
if(!rda->open(&err_msg)) {
QMessageBox::critical(this,"RDLogEdit - "+tr("Error"),err_msg);
exit(1);
}
log_import_path=RDGetHomeDir();
//
// Open Database
//
QString err;
log_db=RDInitDb(&schema,&err);
if(!log_db) {
QMessageBox::warning(this,tr("Can't Connect"),err);
exit(0);
}
if((schema!=RD_VERSION_DATABASE)&&(!skip_db_check)) {
#ifdef WIN32
QMessageBox::warning(this,tr("RDLogEdit -- Database Skew"),
tr("This version of RDLogEdit is incompatible with the version installed on the server.\nSee your system administrator for an update!"));
#else
fprintf(stderr,
"rdlogedit: database version mismatch, should be %u, is %u\n",
RD_VERSION_DATABASE,schema);
#endif // WIN32
exit(256);
}
//
// Allocate Global Resources
//
rdstation_conf=new RDStation(log_config->stationName());
//
// CAE Connection
//
#ifndef WIN32
rdcae=new RDCae(rdstation_conf,log_config,parent);
rdcae->connectHost();
rda->cae()->connectHost();
#endif // WIN32
//
// RIPC Connection
//
#ifndef WIN32
rdripc=new RDRipc(rdstation_conf,log_config,this);
connect(rdripc,SIGNAL(connected(bool)),this,SLOT(connectedData(bool)));
connect(rdripc,SIGNAL(userChanged()),this,SLOT(userData()));
rdripc->connectHost("localhost",RIPCD_TCP_PORT,log_config->password());
connect(rda->ripc(),SIGNAL(connected(bool)),this,SLOT(connectedData(bool)));
connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData()));
rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password());
#else
rdripc=NULL;
#endif // WIN32
//
// System Configuration
//
rdsystem=new RDSystem();
//
// RDLogEdit Configuration
//
rdlogedit_conf=new RDLogeditConf(log_config->stationName());
//
// Create Fonts
//
@ -229,21 +176,19 @@ MainWidget::MainWidget(QWidget *parent)
// User
//
#ifndef WIN32
rduser=NULL;
//
// Load Audio Assignments
//
RDSetMixerPorts(log_config->stationName(),rdcae);
RDSetMixerPorts(rda->config()->stationName(),rda->cae());
#else
rduser=new RDUser(RD_USER_LOGIN_NAME);
rda->user()->setName(RD_USER_LOGIN_NAME);
#endif // WIN32
//
// Log Filter
//
log_filter_widget=
new RDLogFilter(RDLogFilter::UserFilter,rduser,log_config,this);
new RDLogFilter(RDLogFilter::UserFilter,rda->user(),rda->config(),this);
connect(log_filter_widget,SIGNAL(filterChanged(const QString &)),
this,SLOT(filterChangedData(const QString &)));
@ -351,7 +296,7 @@ MainWidget::MainWidget(QWidget *parent)
str2=tr("User")+": ["+tr("Unknown")+"]";
#endif // WIN32
setCaption(QString().sprintf("%s: %s, %s",(const char *)str1,
(const char *)log_config->stationName(),
(const char *)rda->config()->stationName(),
(const char *)str2));
}
@ -380,21 +325,20 @@ void MainWidget::userData()
str1=QString("RDLogEdit")+" v"+VERSION+" - "+tr("Host");
str2=QString(tr("User"));
setCaption(str1+": "+log_config->stationName()+", "+str2+": "+
rdripc->user());
if(rduser!=NULL) {
delete rduser;
}
rduser=new RDUser(rdripc->user());
log_filter_widget->setUser(rduser);
setCaption(str1+": "+rda->config()->stationName()+", "+str2+": "+
rda->ripc()->user());
rda->user()->setName(rda->ripc()->user());
log_filter_widget->setUser(rda->user());
RefreshList();
//
// Set Control Perms
//
log_add_button->setEnabled(rduser->createLog());
log_delete_button->setEnabled(rduser->deleteLog());
log_track_button->setEnabled(rduser->voicetrackLog());
log_add_button->setEnabled(rda->user()->createLog());
log_delete_button->setEnabled(rda->user()->deleteLog());
log_track_button->setEnabled(rda->user()->voicetrackLog());
}
@ -411,9 +355,9 @@ void MainWidget::addData()
std::vector<QString> newlogs;
RDAddLog *log;
if(rduser->createLog()) {
log=new RDAddLog(&logname,&svcname,RDLogFilter::UserFilter,rduser,
rdstation_conf,tr("Add Log"),this);
if(rda->user()->createLog()) {
log=new RDAddLog(&logname,&svcname,RDLogFilter::UserFilter,rda->user(),
rda->station(),tr("Add Log"),this);
if(log->exec()!=0) {
delete log;
return;
@ -422,10 +366,10 @@ void MainWidget::addData()
#ifdef WIN32
QString username(RD_USER_LOGIN_NAME);
#else
QString username(rdripc->user());
QString username(rda->ripc()->user());
#endif // WIN32
QString err_msg;
if(!RDLog::create(logname,svcname,username,&err_msg,log_config)) {
if(!RDLog::create(logname,svcname,username,&err_msg,rda->config())) {
QMessageBox::warning(this,"RDLogEdit - "+tr("Error"),err_msg);
return;
}
@ -478,7 +422,7 @@ void MainWidget::deleteData()
ListListViewItem *item=(ListListViewItem *)log_log_list->firstChild();
std::vector<ListListViewItem *> items;
if(rduser->deleteLog()) {
if(rda->user()->deleteLog()) {
while(item!=NULL) {
if(item->isSelected()) {
items.push_back(item);
@ -534,11 +478,11 @@ void MainWidget::deleteData()
QString username;
QString stationname;
QHostAddress addr;
RDLogLock *log_lock=new RDLogLock(items.at(i)->text(1),rduser,
rdstation_conf,this);
RDLogLock *log_lock=new RDLogLock(items.at(i)->text(1),rda->user(),
rda->station(),this);
if(log_lock->tryLock(&username,&stationname,&addr)) {
RDLog *log=new RDLog(items.at(i)->text(1));
if(log->remove(rdstation_conf,rduser,log_config)) {
if(log->remove(rda->station(),rda->user(),rda->config())) {
delete items.at(i);
}
else {
@ -729,7 +673,7 @@ void MainWidget::logDoubleclickedData(QListViewItem *,const QPoint &,int)
void MainWidget::quitMainWidget()
{
log_db->removeDatabase(log_config->mysqlDbname());
log_db->removeDatabase(rda->config()->mysqlDbname());
exit(0);
}

6
rdlogedit/rdlogedit_cs.ts
View File

@ -749,7 +749,7 @@ vybrané služby!</translation>
</message>
<message>
<source>Can&apos;t Connect</source>
<translation>Nelze spojit</translation>
<translation type="obsolete">Nelze spojit</translation>
</message>
<message>
<source>LOG NAME</source>
@ -879,12 +879,12 @@ Pokračovat?</translation>
</message>
<message>
<source>RDLogEdit -- Database Skew</source>
<translation>RDLogEdit - Nesouměrnost v databázi</translation>
<translation type="obsolete">RDLogEdit - Nesouměrnost v databázi</translation>
</message>
<message>
<source>This version of RDLogEdit is incompatible with the version installed on the server.
See your system administrator for an update!</source>
<translation>Tato verze RDLogEdit je neslučitelná s verzí nainstalovanou na serveru.
<translation type="obsolete">Tato verze RDLogEdit je neslučitelná s verzí nainstalovanou na serveru.
Vyhledejte svého správce systému kvůli aktualizaci!</translation>
</message>
<message>

11
rdlogedit/rdlogedit_de.ts
View File

@ -749,7 +749,7 @@ Gruppe des ausgewählten Service!</translation>
</message>
<message>
<source>Can&apos;t Connect</source>
<translation>Kann nicht verbinden</translation>
<translation type="obsolete">Kann nicht verbinden</translation>
</message>
<message>
<source>LOG NAME</source>
@ -877,15 +877,6 @@ Fortfahren?</translation>
<source>Unable to delete log, audio deletion error!</source>
<translation type="obsolete">Kann Logdatei nicht löschen, Audiolöschfehler!</translation>
</message>
<message>
<source>RDLogEdit -- Database Skew</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This version of RDLogEdit is incompatible with the version installed on the server.
See your system administrator for an update!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Host</source>
<translation type="unfinished"></translation>

6
rdlogedit/rdlogedit_es.ts
View File

@ -749,7 +749,7 @@ desactivado para el servicio especificado!</translation>
</message>
<message>
<source>Can&apos;t Connect</source>
<translation>No puedo conectarme</translation>
<translation type="obsolete">No puedo conectarme</translation>
</message>
<message>
<source>LOG NAME</source>
@ -875,12 +875,12 @@ de Listas</translation>
</message>
<message>
<source>RDLogEdit -- Database Skew</source>
<translation>RDLogEdit -- Asimetría en la Base de Datos</translation>
<translation type="obsolete">RDLogEdit -- Asimetría en la Base de Datos</translation>
</message>
<message>
<source>This version of RDLogEdit is incompatible with the version installed on the server.
See your system administrator for an update!</source>
<translation>Esta versión de RDLogEdit es incompatible con la versión instalada en el servidor.
<translation type="obsolete">Esta versión de RDLogEdit es incompatible con la versión instalada en el servidor.
¡Solicite una actualización al administrador!</translation>
</message>
<message>

13
rdlogedit/rdlogedit_fr.ts
View File

@ -684,10 +684,6 @@ group for the specified service!</source>
</context>
<context>
<name>MainWidget</name>
<message>
<source>Can&apos;t Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LOG NAME</source>
<translation type="unfinished"></translation>
@ -790,15 +786,6 @@ Report</source>
<source>TFN</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDLogEdit -- Database Skew</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This version of RDLogEdit is incompatible with the version installed on the server.
See your system administrator for an update!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Host</source>
<translation type="unfinished"></translation>

11
rdlogedit/rdlogedit_nb.ts
View File

@ -771,7 +771,7 @@ som er skrudd av for denne tenesta!</translation>
</message>
<message>
<source>Can&apos;t Connect</source>
<translation>Greier ikkje kopla til</translation>
<translation type="obsolete">Greier ikkje kopla til</translation>
</message>
<message>
<source>LOG NAME</source>
@ -895,15 +895,6 @@ Vil du halda fram?</translation>
<source>RDLogEdit</source>
<translation type="obsolete">RDLogEdit</translation>
</message>
<message>
<source>RDLogEdit -- Database Skew</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This version of RDLogEdit is incompatible with the version installed on the server.
See your system administrator for an update!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Host</source>
<translation type="unfinished"></translation>

11
rdlogedit/rdlogedit_nn.ts
View File

@ -771,7 +771,7 @@ som er skrudd av for denne tenesta!</translation>
</message>
<message>
<source>Can&apos;t Connect</source>
<translation>Greier ikkje kopla til</translation>
<translation type="obsolete">Greier ikkje kopla til</translation>
</message>
<message>
<source>LOG NAME</source>
@ -895,15 +895,6 @@ Vil du halda fram?</translation>
<source>RDLogEdit</source>
<translation type="obsolete">RDLogEdit</translation>
</message>
<message>
<source>RDLogEdit -- Database Skew</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This version of RDLogEdit is incompatible with the version installed on the server.
See your system administrator for an update!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Host</source>
<translation type="unfinished"></translation>

11
rdlogedit/rdlogedit_pt_BR.ts
View File

@ -751,7 +751,7 @@ Ação se Evento anterior estiver sendo executado</translation>
</message>
<message>
<source>Can&apos;t Connect</source>
<translation>Não foi possível Conectar</translation>
<translation type="obsolete">Não foi possível Conectar</translation>
</message>
<message>
<source>LOG NAME</source>
@ -874,15 +874,6 @@ Continuar?</translation>
<source>RDLogEdit</source>
<translation type="obsolete">RDListas</translation>
</message>
<message>
<source>RDLogEdit -- Database Skew</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This version of RDLogEdit is incompatible with the version installed on the server.
See your system administrator for an update!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Host</source>
<translation type="unfinished"></translation>

113
rdlogedit/voice_tracker.cpp
View File

@ -28,22 +28,21 @@
#include <qdatetime.h>
#include <qapplication.h>
#include <rdapplication.h>
#include <rdconf.h>
#include <rdcart.h>
#include <rd.h>
#include <rdlog.h>
#include <rdsvc.h>
#include <rdlogedit_conf.h>
#include <rdlibrary_conf.h>
#include <rdedit_audio.h>
#include <rdimport_audio.h>
#include <rdrehash.h>
#include <rdwavedata.h>
#include <globals.h>
#include <voice_tracker.h>
#include <import_track.h>
#include <edit_track.h>
#include "edit_track.h"
#include "globals.h"
#include "import_track.h"
#include "voice_tracker.h"
//
// Icons
@ -163,7 +162,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
//
// Macro Event Player
//
track_event_player=new RDEventPlayer(rdripc,this);
track_event_player=new RDEventPlayer(rda->ripc(),this);
//
// Waveform Pixmaps
@ -186,13 +185,13 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
//
// Audio Parameters
//
RDLogeditConf *conf=new RDLogeditConf(log_config->stationName());
RDLogeditConf *conf=new RDLogeditConf(rda->config()->stationName());
edit_input_card=conf->inputCard();
edit_input_port=conf->inputPort();
edit_output_card=conf->outputCard();
edit_output_port=conf->outputPort();
edit_format=conf->format();
edit_samprate=rdsystem->sampleRate();
edit_samprate=rda->system()->sampleRate();
edit_bitrate=conf->bitrate();
edit_chans=conf->defaultChannels();
play_start_macro=conf->startCart();
@ -205,7 +204,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
conf->getSettings(edit_settings);
delete conf;
RDLibraryConf *lconf=new RDLibraryConf(log_config->stationName());
RDLibraryConf *lconf=new RDLibraryConf(rda->config()->stationName());
edit_tail_preroll=lconf->tailPreroll();
edit_threshold_level=lconf->trimThreshold();
delete lconf;
@ -214,7 +213,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
// Voicetrack Group
//
RDLog *log=new RDLog(logname);
RDSvc *svc=new RDSvc(log->service(),rdstation_conf,log_config);
RDSvc *svc=new RDSvc(log->service(),rda->station(),rda->config());
track_group=new RDGroup(svc->trackGroup());
track_tracks=log->scheduledTracks()-log->completedTracks();
delete svc;
@ -224,7 +223,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
// Play Decks
//
for(int i=0;i<3;i++) {
edit_deck[i]=new RDPlayDeck(rdcae,i);
edit_deck[i]=new RDPlayDeck(rda->cae(),i);
edit_deck[i]->setCard(edit_output_card);
edit_deck[i]->setPort(edit_output_port);
connect(edit_deck[i],SIGNAL(stateChanged(int,RDPlayDeck::State)),
@ -236,19 +235,19 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
//
// Record Slot Connections
//
connect(rdcae,SIGNAL(recordLoaded(int,int)),
connect(rda->cae(),SIGNAL(recordLoaded(int,int)),
this,SLOT(recordLoadedData(int,int)));
connect(rdcae,SIGNAL(recording(int,int)),
connect(rda->cae(),SIGNAL(recording(int,int)),
this,SLOT(recordingData(int,int)));
connect(rdcae,SIGNAL(recordStopped(int,int)),
connect(rda->cae(),SIGNAL(recordStopped(int,int)),
this,SLOT(recordStoppedData(int,int)));
connect(rdcae,SIGNAL(recordUnloaded(int,int,unsigned)),
connect(rda->cae(),SIGNAL(recordUnloaded(int,int,unsigned)),
this,SLOT(recordUnloadedData(int,int,unsigned)));
//
// Log Data Structures
//
track_log_lock=new RDLogLock(edit_log_name,rduser,rdstation_conf,this);
track_log_lock=new RDLogLock(edit_log_name,rda->user(),rda->station(),this);
track_log=new RDLog(edit_log_name);
track_log_event=new RDLogEvent(RDLog::tableName(edit_log_name));
track_log_event->load();
@ -299,7 +298,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
track_track2_button->setFont(font);
track_track2_button->setText(tr("Start"));
connect(track_track2_button,SIGNAL(clicked()),this,SLOT(track2Data()));
if(!rdlogedit_conf->enableSecondStart()) {
if(!rda->logeditConf()->enableSecondStart()) {
track_track2_button->hide();
}
@ -307,7 +306,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
// Finished Button
//
track_finished_button=new QPushButton(this);
if(rdlogedit_conf->enableSecondStart()) {
if(rda->logeditConf()->enableSecondStart()) {
track_finished_button->setGeometry(sizeHint().width()-90,255,70,70);
}
else {
@ -818,7 +817,7 @@ void VoiceTracker::track1Data()
tr("Unable to create new cart for voice track!"));
return;
}
rdcae->loadRecord(edit_input_card,edit_input_port,
rda->cae()->loadRecord(edit_input_card,edit_input_port,
edit_track_cuts[1]->cutName(),
edit_coding,edit_chans,edit_samprate,edit_bitrate);
playData();
@ -848,7 +847,7 @@ void VoiceTracker::recordData()
tr("Unable to create new cart for voice track!"));
return;
}
rdcae->loadRecord(edit_input_card,edit_input_port,
rda->cae()->loadRecord(edit_input_card,edit_input_port,
edit_track_cuts[1]->cutName(),
edit_coding,edit_chans,edit_samprate,edit_bitrate);
edit_sliding=true;
@ -865,9 +864,9 @@ void VoiceTracker::recordData()
track_event_player->exec(record_start_macro);
edit_wave_name[1]=RDCut::pathName(edit_track_cuts[1]->cutName());
wpg[1]=new RDWavePainter(edit_wave_map[1],edit_track_cuts[1],
rdstation_conf,rduser,log_config);
rda->station(),rda->user(),rda->config());
wpg[1]->end();
rdcae->record(edit_input_card,edit_input_port,0,0);
rda->cae()->record(edit_input_card,edit_input_port,0,0);
track_record_ran=true;
track_record_start_time=GetCurrentTime();
if(edit_deck_state==VoiceTracker::DeckTrack1) {
@ -948,13 +947,13 @@ void VoiceTracker::finishedData()
case VoiceTracker::DeckTrack1:
track_aborting=true;
stopData();
rdcae->unloadRecord(edit_input_card,edit_input_port);
rda->cae()->unloadRecord(edit_input_card,edit_input_port);
edit_deck_state=VoiceTracker::DeckIdle;
resetData();
break;
case VoiceTracker::DeckTrack2:
if(rdlogedit_conf->enableSecondStart()) {
if(rda->logeditConf()->enableSecondStart()) {
if(edit_wave_name[2].isEmpty()||
((edit_logline[2]->transType()!=RDLogLine::Segue))) {
FinishTrack();
@ -962,7 +961,7 @@ void VoiceTracker::finishedData()
else {
track_aborting=true;
stopData();
rdcae->stopRecord(edit_input_card,edit_input_port);
rda->cae()->stopRecord(edit_input_card,edit_input_port);
edit_deck_state=VoiceTracker::DeckIdle;
resetData();
}
@ -1036,7 +1035,7 @@ void VoiceTracker::resetData()
edit_logline[1]->setForcedLength(0);
edit_logline[1]->clearTrackData(RDLogLine::AllTrans);
track_log_event->removeCustomTransition(edit_track_line[1]);
if(!edit_track_cart->remove(rdstation_conf,rduser,log_config)) {
if(!edit_track_cart->remove(rda->station(),rda->user(),rda->config())) {
QMessageBox::warning(this,tr("RDLogEdit"),tr("Audio Deletion Error!"));
}
delete edit_track_cart;
@ -1261,7 +1260,7 @@ void VoiceTracker::editAudioData()
RDCart *rdcart=new RDCart(edit_logline[edit_rightclick_track]->cartNumber());
RDEditAudio *edit=
new RDEditAudio(rdcart,edit_logline[edit_rightclick_track]->cutName(),
rdcae,rduser,rdstation_conf,log_config,edit_output_card,
rda->cae(),rda->user(),rda->station(),rda->config(),edit_output_card,
edit_output_port,edit_tail_preroll,
edit_threshold_level,this);
if(edit->exec()!=-1) {
@ -1822,14 +1821,14 @@ void VoiceTracker::meterData()
if((edit_deck[i]->state()==RDPlayDeck::Playing)||
(edit_deck[i]->state()==RDPlayDeck::Stopping)) {
positionData(i,edit_deck[i]->currentPosition());
rdcae->
rda->cae()->
outputMeterUpdate(edit_deck[i]->card(),edit_deck[i]->port(),level);
for(int j=0;j<2;j++) {
ratio[j]+=pow(10.0,((double)level[j])/1000.0);
}
}
if(track_recording) {
rdcae->
rda->cae()->
inputMeterUpdate(edit_input_card,edit_input_port,level);
for(int j=0;j<2;j++) {
ratio[j]+=pow(10.0,((double)level[j])/1000.0);
@ -1879,7 +1878,7 @@ void VoiceTracker::recordStoppedData(int card,int stream)
if((card!=edit_input_card)||(stream!=edit_input_port)) {
return;
}
rdcae->unloadRecord(edit_input_card,edit_input_port);
rda->cae()->unloadRecord(edit_input_card,edit_input_port);
track_event_player->exec(record_end_macro);
}
@ -1893,12 +1892,12 @@ void VoiceTracker::recordUnloadedData(int card,int stream,unsigned msecs)
track_recording=false;
if(!track_aborting) {
edit_track_cuts[1]->
checkInRecording(rdstation_conf->name(),rduser->name(),
rdstation_conf->name(),edit_settings,msecs);
RDRehash::rehash(rdstation_conf,rduser,log_config,
checkInRecording(rda->station()->name(),rda->user()->name(),
rda->station()->name(),edit_settings,msecs);
RDRehash::rehash(rda->station(),rda->user(),rda->config(),
edit_track_cuts[1]->cartNumber(),
edit_track_cuts[1]->cutNumber());
edit_track_cuts[1]->setSampleRate(rdsystem->sampleRate());
edit_track_cuts[1]->setSampleRate(rda->system()->sampleRate());
edit_track_cart->updateLength();
edit_track_cart->resetRotation();
edit_logline[1]->
@ -1906,7 +1905,7 @@ void VoiceTracker::recordUnloadedData(int card,int stream,unsigned msecs)
edit_logline[1]->setEvent(0,RDLogLine::Segue,false);
edit_logline[1]->setType(RDLogLine::Cart);
edit_logline[1]->setSource(RDLogLine::Tracker);
edit_logline[1]->setOriginUser(rduser->name());
edit_logline[1]->setOriginUser(rda->user()->name());
edit_logline[1]->setOriginDateTime(QDateTime(QDate::currentDate(),
QTime::currentTime()));
edit_logline[1]->
@ -1971,7 +1970,7 @@ void VoiceTracker::closeData()
stopData();
CheckChanges();
if(track_size_altered) {
track_log_event->save(log_config);
track_log_event->save(rda->config());
}
done(0);
}
@ -2235,7 +2234,7 @@ void VoiceTracker::LoadTrack(int line)
delete wpg[i];
}
wpg[i]=new RDWavePainter(edit_wave_map[i],edit_track_cuts[i],
rdstation_conf,rduser,log_config);
rda->station(),rda->user(),rda->config());
wpg[i]->end();
}
}
@ -2338,10 +2337,10 @@ void VoiceTracker::SaveTrack(int line)
}
if(track_size_altered) {
track_log_event->save(log_config);
track_log_event->save(rda->config());
}
else {
track_log_event->saveModified(log_config);
track_log_event->saveModified(rda->config());
}
track_log->
@ -2361,8 +2360,8 @@ bool VoiceTracker::ImportTrack(RDListViewItem *item)
RDWaveData *wdata=new RDWaveData();
RDImportAudio *import=
new RDImportAudio(edit_track_cuts[1]->cutName(),edit_import_path,
edit_settings,&metadata,wdata,NULL,rdstation_conf,rduser,
&import_running,log_config,this);
edit_settings,&metadata,wdata,NULL,rda->station(),rda->user(),
&import_running,rda->config(),this);
if(import->exec(true,false)<0) {
delete import;
delete wdata;
@ -2394,7 +2393,7 @@ bool VoiceTracker::ImportTrack(RDListViewItem *item)
edit_logline[1]->setEvent(0,RDLogLine::Segue,false);
edit_logline[1]->setType(RDLogLine::Cart);
edit_logline[1]->setSource(RDLogLine::Tracker);
edit_logline[1]->setOriginUser(rduser->name());
edit_logline[1]->setOriginUser(rda->user()->name());
edit_logline[1]->setOriginDateTime(QDateTime(QDate::currentDate(),
QTime::currentTime()));
edit_logline[1]->setFadeupPoint(edit_track_cuts[1]->startPoint(),
@ -3785,7 +3784,7 @@ void VoiceTracker::UpdateControls()
}
else {
if((edit_logline[2]->transType()==RDLogLine::Segue)) {
if(rdlogedit_conf->enableSecondStart()) {
if(rda->logeditConf()->enableSecondStart()) {
track_finished_button->setPalette(track_abort_palette);
track_finished_button->setText(tr("Abort"));
}
@ -3962,21 +3961,21 @@ bool VoiceTracker::InitTrack()
}
edit_track_cuts[1]=new RDCut(edit_track_cart->number(),cutnum);
switch(edit_format) {
case 0:
edit_coding=RDCae::Pcm16;
break;
case 0:
edit_coding=RDCae::Pcm16;
break;
case 1:
edit_coding=RDCae::MpegL2;
break;
case 1:
edit_coding=RDCae::MpegL2;
break;
case 2:
edit_coding=RDCae::Pcm24;
break;
case 2:
edit_coding=RDCae::Pcm24;
break;
default:
edit_coding=RDCae::Pcm16;
break;
default:
edit_coding=RDCae::Pcm16;
break;
}
edit_deck_state=VoiceTracker::DeckTrack1;
edit_sliding=false;
@ -4004,7 +4003,7 @@ void VoiceTracker::FinishTrack()
setAverageSegueLength(edit_logline[0]->segueStartPoint()-
edit_logline[0]->startPoint());
if(!edit_wave_name[1].isEmpty()) {
rdcae->stopRecord(edit_input_card,edit_input_port);
rda->cae()->stopRecord(edit_input_card,edit_input_port);
edit_logline[1]->setEndPoint(-1,RDLogLine::LogPointer);
}
stopData();