From 850a0b4ece2cc2d8a0d66c260f3179d13c47d53a Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 16 Sep 2022 17:42:02 -0400 Subject: [PATCH] 2022-09-16 Fred Gleason * Removed the 'Format' column from the event list in rdcatch(1). * Removed the 'Sample Rate' column from the event list in rdcatch(1). * Removed the 'Channels' column from the event list in rdcatch(1). * Removed the 'Bitrate' column from the event list in rdcatch(1). * Removed the 'Host' column from the event list in rdcatch(1). * Removed the 'Deck' column from the event list in rdcatch(1). * Removed the 'Cart' column from the event list in rdcatch(1). * Removed the 'Type' column from the event list in rdcatch(1). * Removed the 'State' column from the event list in rdcatch(1). Signed-off-by: Fred Gleason --- ChangeLog | 10 ++ rdcatch/recordlistmodel.cpp | 260 ++++++++++-------------------------- 2 files changed, 78 insertions(+), 192 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc5bbee6..6739b39a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23314,3 +23314,13 @@ * Fixed a bug on the 'Edit Log Marker' dialog in rdlogedit(1) that made it limited the maximum length of the 'Label' field to 10 characters. +2022-09-16 Fred Gleason + * Removed the 'Format' column from the event list in rdcatch(1). + * Removed the 'Sample Rate' column from the event list in rdcatch(1). + * Removed the 'Channels' column from the event list in rdcatch(1). + * Removed the 'Bitrate' column from the event list in rdcatch(1). + * Removed the 'Host' column from the event list in rdcatch(1). + * Removed the 'Deck' column from the event list in rdcatch(1). + * Removed the 'Cart' column from the event list in rdcatch(1). + * Removed the 'Type' column from the event list in rdcatch(1). + * Removed the 'State' column from the event list in rdcatch(1). diff --git a/rdcatch/recordlistmodel.cpp b/rdcatch/recordlistmodel.cpp index f93344ba..14fce3cd 100644 --- a/rdcatch/recordlistmodel.cpp +++ b/rdcatch/recordlistmodel.cpp @@ -121,60 +121,23 @@ RecordListModel::RecordListModel(QObject *parent) d_alignments.push_back(left); d_order_columns.push_back("`RECORDINGS`.`ENDDATE_OFFSET`"); - d_headers.push_back(tr("Format")); // 20 - d_alignments.push_back(left); - d_order_columns.push_back("`RECORDINGS`.`FORMAT`"); - - d_headers.push_back(tr("Channels")); // 21 - d_alignments.push_back(left); - d_order_columns.push_back("`RECORDINGS`.`CHANNELS`"); - - d_headers.push_back(tr("Sample Rate")); // 22 - d_alignments.push_back(left); - d_order_columns.push_back("`RECORDINGS`.`SAMPRATE`"); - - d_headers.push_back(tr("Bit Rate")); // 23 - d_alignments.push_back(left); - d_order_columns.push_back("`RECORDINGS`.`BITRATE`"); - - d_headers.push_back(tr("Host")); // 24 + d_headers.push_back(tr("Cut")); // 20 d_alignments.push_back(left); d_order_columns.push_back(""); - d_headers.push_back(tr("Deck")); // 25 - d_alignments.push_back(left); - d_order_columns.push_back(""); - - d_headers.push_back(tr("Cut")); // 26 - d_alignments.push_back(left); - d_order_columns.push_back(""); - - d_headers.push_back(tr("Cart")); // 27 - d_alignments.push_back(left); - d_order_columns.push_back(""); - - d_headers.push_back(tr("ID")); // 28 + d_headers.push_back(tr("ID")); // 21 d_alignments.push_back(left); d_order_columns.push_back("`RECORDINGS`.`ID`"); - d_headers.push_back(tr("Type")); // 29 - d_alignments.push_back(left); - d_order_columns.push_back("`RECORDINGS`.`TYPE`"); - - d_headers.push_back(tr("Status")); // 30 + d_headers.push_back(tr("Status")); // 22 d_alignments.push_back(left); d_order_columns.push_back(""); - d_headers.push_back(tr("Exit Code")); // 31 + d_headers.push_back(tr("Exit Code")); // 23 d_alignments.push_back(left); d_order_columns.push_back("`RECORDINGS`.`EXIT_CODE`"); - d_headers.push_back(tr("State")); // 32 - d_alignments.push_back(left); - d_order_columns.push_back(""); - setFilterSql(""); - // updateModel(); } @@ -295,13 +258,13 @@ RDRecording::ExitCode RecordListModel::recordExitCode(const QModelIndex &row) QString RecordListModel::hostName(const QModelIndex &row) const { - return d_texts.at(row.row()).at(24).toString(); + return d_texts.at(row.row()).at(23).toString(); } QString RecordListModel::cutName(const QModelIndex &row) const { - return d_texts.at(row.row()).at(26).toString(); + return d_texts.at(row.row()).at(25).toString(); } @@ -384,7 +347,7 @@ void RecordListModel::channelCounts(int chan,int *waiting,int *active, *rec_id=0; for(int i=0;ivalue(0).toUInt(); - d_types[row]=(RDRecording::Type)q->value(26).toUInt(); - d_exit_codes[row]=(RDRecording::ExitCode)q->value(28).toUInt(); + d_types[row]=(RDRecording::Type)q->value(22).toUInt(); + d_exit_codes[row]=(RDRecording::ExitCode)q->value(24).toUInt(); // // Qt::TextColorRole @@ -653,10 +611,10 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q) icons.push_back(QPixmap()); } icons[0]= - rda->iconEngine()->catchIcon((RDRecording::Type)q->value(26).toUInt()); + rda->iconEngine()->catchIcon((RDRecording::Type)q->value(22).toUInt()); icons[1]=rda->iconEngine()->stationIcon(); - if(!q->value(47).isNull()) { - icons[13]=QImage::fromData(q->value(47).toByteArray()). + if(!q->value(43).isNull()) { + icons[13]=QImage::fromData(q->value(43).toByteArray()). scaled(22,22,Qt::IgnoreAspectRatio,Qt::SmoothTransformation); } @@ -690,64 +648,57 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q) texts[13]=tr("Sa"); } - switch((RDRecording::Type)q->value(26).toInt()) { + switch((RDRecording::Type)q->value(22).toInt()) { case RDRecording::Recording: case RDRecording::Playout: case RDRecording::Download: case RDRecording::Upload: - texts[15]=q->value(40).toString()+" - "+q->value(41).toDateTime(). + texts[15]=q->value(36).toString()+" - "+q->value(37).toDateTime(). toString("M/dd/yyyy hh:mm:ss"); break; default: break; } - texts[16]=q->value(29).toString(); // One Shot + texts[16]=q->value(25).toString(); // One Shot texts[17]=QString::asprintf("%d ", // Trim Threshold -q->value(17).toInt())+tr("dB"); texts[18]=q->value(18).toString(); // Startdate Offset texts[19]=q->value(19).toString(); // Enddate Offset - texts[24]=q->value(3).toString(); // Station - texts[25]=q->value(24).toString(); // Deck - texts[26]=q->value(6).toString(); // Cut Name - if(q->value(24).toInt()>=0) { - texts[27]=q->value(25).toString(); // Macro Cart - } - texts[28]=q->value(0).toString(); // Id - texts[29]=q->value(26).toString(); // Type - texts[32]=QString::asprintf("%u",RDDeck::Idle); + texts[20]=q->value(6).toString(); // Cut Name + texts[21]=q->value(0).toString(); // Id - switch((RDRecording::Type)q->value(26).toInt()) { + switch((RDRecording::Type)q->value(22).toInt()) { case RDRecording::Recording: texts[1]=q->value(3).toString()+ - QString::asprintf(" : %dR",q->value(24).toInt()); - switch((RDRecording::StartType)q->value(30).toUInt()) { + QString::asprintf(" : %dR",q->value(20).toInt()); + switch((RDRecording::StartType)q->value(26).toUInt()) { case RDRecording::HardStart: texts[2]=tr("Hard")+": "+rda->timeString(q->value(4).toTime()); break; case RDRecording::GpiStart: texts[2]=tr("Gpi")+": "+rda->timeString(q->value(4).toTime())+","+ - rda->timeString(q->value(4).toTime().addMSecs(q->value(31).toInt()))+ + rda->timeString(q->value(4).toTime().addMSecs(q->value(27).toInt()))+ ","+ - QString::asprintf("%d:%d,",q->value(32).toInt(),q->value(33).toInt())+ - QTime(0,0,0).addMSecs(q->value(34).toUInt()).toString("mm:ss"); + QString::asprintf("%d:%d,",q->value(28).toInt(),q->value(29).toInt())+ + QTime(0,0,0).addMSecs(q->value(30).toUInt()).toString("mm:ss"); break; } - switch((RDRecording::EndType)q->value(35).toUInt()) { + switch((RDRecording::EndType)q->value(31).toUInt()) { case RDRecording::LengthEnd: texts[3]=tr("Len")+": "+RDGetTimeLength(q->value(5).toUInt(),false,false); break; case RDRecording::HardEnd: - texts[3]=tr("Hard")+": "+rda->timeString(q->value(36).toTime()); + texts[3]=tr("Hard")+": "+rda->timeString(q->value(32).toTime()); break; case RDRecording::GpiEnd: - texts[3]=tr("Gpi")+": "+rda->timeString(q->value(36).toTime())+","+ - rda->timeString(q->value(36).toTime().addMSecs(q->value(37).toInt()))+ - QString::asprintf(",%d:%d",q->value(38).toInt(), - q->value(39).toInt()); + texts[3]=tr("Gpi")+": "+rda->timeString(q->value(32).toTime())+","+ + rda->timeString(q->value(32).toTime().addMSecs(q->value(33).toInt()))+ + QString::asprintf(",%d:%d",q->value(34).toInt(), + q->value(35).toInt()); break; } @@ -757,51 +708,18 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q) "`SWITCH_MATRIX` "+ // 01 "from `DECKS` where "+ "(`STATION_NAME`='"+RDEscapeString(q->value(3).toString())+"')&&"+ - QString::asprintf("(`CHANNEL`=%d)",q->value(24).toInt()); + QString::asprintf("(`CHANNEL`=%d)",q->value(20).toInt()); q1=new RDSqlQuery(sql); if(q1->first()) { // Source texts[5]=GetSourceName(q1->value(0).toString(),q1->value(1).toInt(), q->value(14).toInt()); } delete q1; - switch((RDSettings::Format)q->value(20).toInt()) { // Format - case RDSettings::Pcm16: - texts[20]=tr("PCM16"); - break; - - case RDSettings::Pcm24: - texts[20]=tr("PCM24"); - break; - - case RDSettings::MpegL1: - texts[20]=tr("MPEG Layer 1"); - break; - - case RDSettings::MpegL2: - case RDSettings::MpegL2Wav: - texts[20]=tr("MPEG Layer 2"); - break; - - case RDSettings::MpegL3: - texts[20]=tr("MPEG Layer 3"); - break; - - case RDSettings::Flac: - texts[20]=tr("FLAC"); - break; - - case RDSettings::OggVorbis: - texts[20]=tr("OggVorbis"); - break; - } - texts[21]=q->value(21).toString(); // Channels - texts[22]=q->value(22).toString(); // Sample Rate - texts[23]=q->value(23).toString(); // Bit Rate break; case RDRecording::Playout: texts[1]=q->value(3).toString()+QString::asprintf(" : %dP", - q->value(24).toInt()-128); + q->value(20).toInt()-128); texts[2]=tr("Hard")+": "+rda->timeString(q->value(4).toTime()); cut=new RDCut(q->value(6).toString()); if(cut->exists()) { @@ -815,26 +733,26 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q) texts[1]=q->value(3).toString(); texts[2]=tr("Hard")+": "+q->value(4).toTime(). toString(QString::asprintf("hh:mm:ss")); - texts[5]=tr("Cart")+QString::asprintf(" %06d",q->value(25).toInt()); + texts[5]=tr("Cart")+QString::asprintf(" %06d",q->value(21).toInt()); break; case RDRecording::SwitchEvent: texts[1]=q->value(3).toString(); texts[2]=tr("Hard")+": "+rda->timeString(q->value(4).toTime()); texts[4]= - d_router_names.value(q->value(3).toString()).value(q->value(24).toInt()); + d_router_names.value(q->value(3).toString()).value(q->value(20).toInt()); texts[5]=GetSourceName(q->value(3).toString(), // Source - q->value(24).toInt(), + q->value(20).toInt(), q->value(14).toInt()); texts[6]=GetDestinationName(q->value(3).toString(), // Dest - q->value(24).toInt(), - q->value(27).toInt()); + q->value(20).toInt(), + q->value(23).toInt()); break; case RDRecording::Download: texts[1]=q->value(3).toString(); texts[2]=tr("Hard")+": "+rda->timeString(q->value(4).toTime()); - texts[5]=q->value(42).toString(); + texts[5]=q->value(38).toString(); texts[6]=tr("Cut")+" "+q->value(6).toString(); break; @@ -842,50 +760,12 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q) texts[1]=q->value(3).toString(); texts[2]=tr("Hard")+": "+rda->timeString(q->value(4).toTime()); texts[5]=tr("Cut")+" "+q->value(6).toString(); - texts[6]=q->value(42).toString(); - switch((RDSettings::Format)q->value(20).toInt()) { // Format - case RDSettings::Pcm16: - texts[20]=tr("PCM16"); - break; - - case RDSettings::Pcm24: - texts[20]=tr("PCM24"); - break; - - case RDSettings::MpegL1: - texts[20]=tr("MPEG Layer 1"); - break; - - case RDSettings::MpegL2: - case RDSettings::MpegL2Wav: - texts[20]=tr("MPEG Layer 2"); - break; - - case RDSettings::MpegL3: - texts[20]=tr("MPEG Layer 3"); - break; - - case RDSettings::Flac: - texts[20]=tr("FLAC"); - break; - - case RDSettings::OggVorbis: - texts[20]=tr("OggVorbis"); - break; - } - if(q->value(44).toString().isEmpty()) { + texts[6]=q->value(38).toString(); + if(q->value(40).toString().isEmpty()) { texts[14]=tr("[none]"); } else { - texts[14]=q->value(44).toString(); // Feed Key Name - } - texts[22]=q->value(21).toString(); // Channels - texts[23]=q->value(22).toString(); // Sample Rate - if(q->value(23).toInt()==0) { // Bit Rate/Quality - texts[23]=QString::asprintf("Qual %d",q->value(43).toInt()); - } - else { - texts[23]=QString::asprintf("%d kb/sec",q->value(23).toInt()/1000); + texts[14]=q->value(40).toString(); // Feed Key Name } break; @@ -921,34 +801,30 @@ QString RecordListModel::sqlFields() const "`RECORDINGS`.`TRIM_THRESHOLD`,"+ // 17 "`RECORDINGS`.`STARTDATE_OFFSET`,"+ // 18 "`RECORDINGS`.`ENDDATE_OFFSET`,"+ // 19 - "`RECORDINGS`.`FORMAT`,"+ // 20 - "`RECORDINGS`.`CHANNELS`,"+ // 21 - "`RECORDINGS`.`SAMPRATE`,"+ // 22 - "`RECORDINGS`.`BITRATE`,"+ // 23 - "`RECORDINGS`.`CHANNEL`,"+ // 24 - "`RECORDINGS`.`MACRO_CART`,"+ // 25 - "`RECORDINGS`.`TYPE`,"+ // 26 - "`RECORDINGS`.`SWITCH_OUTPUT`,"+ // 27 - "`RECORDINGS`.`EXIT_CODE`,"+ // 28 - "`RECORDINGS`.`ONE_SHOT`,"+ // 29 - "`RECORDINGS`.`START_TYPE`,"+ // 30 - "`RECORDINGS`.`START_LENGTH`,"+ // 31 - "`RECORDINGS`.`START_MATRIX`,"+ // 32 - "`RECORDINGS`.`START_LINE`,"+ // 33 - "`RECORDINGS`.`START_OFFSET`,"+ // 34 - "`RECORDINGS`.`END_TYPE`,"+ // 35 - "`RECORDINGS`.`END_TIME`,"+ // 36 - "`RECORDINGS`.`END_LENGTH`,"+ // 37 - "`RECORDINGS`.`END_MATRIX`,"+ // 38 - "`RECORDINGS`.`END_LINE`,"+ // 39 - "`CUTS`.`ORIGIN_NAME`,"+ // 40 - "`CUTS`.`ORIGIN_DATETIME`,"+ // 41 - "`RECORDINGS`.`URL`,"+ // 42 - "`RECORDINGS`.`QUALITY`,"+ // 43 - "`FEEDS`.`KEY_NAME`,"+ // 44 - "`FEEDS`.`CHANNEL_IMAGE_ID`,"+ // 45 - "`RECORDINGS`.`EXIT_TEXT`,"+ // 46 - "`FEED_IMAGES`.`DATA` "+ // 47 + "`RECORDINGS`.`CHANNEL`,"+ // 20 + "`RECORDINGS`.`MACRO_CART`,"+ // 21 + "`RECORDINGS`.`TYPE`,"+ // 22 + "`RECORDINGS`.`SWITCH_OUTPUT`,"+ // 23 + "`RECORDINGS`.`EXIT_CODE`,"+ // 24 + "`RECORDINGS`.`ONE_SHOT`,"+ // 25 + "`RECORDINGS`.`START_TYPE`,"+ // 26 + "`RECORDINGS`.`START_LENGTH`,"+ // 27 + "`RECORDINGS`.`START_MATRIX`,"+ // 28 + "`RECORDINGS`.`START_LINE`,"+ // 29 + "`RECORDINGS`.`START_OFFSET`,"+ // 30 + "`RECORDINGS`.`END_TYPE`,"+ // 31 + "`RECORDINGS`.`END_TIME`,"+ // 32 + "`RECORDINGS`.`END_LENGTH`,"+ // 33 + "`RECORDINGS`.`END_MATRIX`,"+ // 34 + "`RECORDINGS`.`END_LINE`,"+ // 35 + "`CUTS`.`ORIGIN_NAME`,"+ // 36 + "`CUTS`.`ORIGIN_DATETIME`,"+ // 37 + "`RECORDINGS`.`URL`,"+ // 38 + "`RECORDINGS`.`QUALITY`,"+ // 39 + "`FEEDS`.`KEY_NAME`,"+ // 40 + "`FEEDS`.`CHANNEL_IMAGE_ID`,"+ // 41 + "`RECORDINGS`.`EXIT_TEXT`,"+ // 42 + "`FEED_IMAGES`.`DATA` "+ // 43 "from `RECORDINGS` left join `CUTS` "+ "on (`RECORDINGS`.`CUT_NAME`=`CUTS`.`CUT_NAME`) left join `FEEDS` "+ "on (`RECORDINGS`.`FEED_ID`=`FEEDS`.`ID`) left join `FEED_IMAGES` "+ @@ -1040,7 +916,7 @@ void RecordListModel::UpdateStatus(int line) // // Exit Code/Text // - d_texts[line][30]=QString::asprintf("%u",code); + d_texts[line][23]=QString::asprintf("%u",code); switch(code) { case RDRecording::Ok: case RDRecording::Downloading: @@ -1048,7 +924,7 @@ void RecordListModel::UpdateStatus(int line) case RDRecording::RecordActive: case RDRecording::PlayActive: case RDRecording::Waiting: - d_texts[line][29]=RDRecording::exitString(code); + d_texts[line][22]=RDRecording::exitString(code); break; case RDRecording::Short: @@ -1058,13 +934,13 @@ void RecordListModel::UpdateStatus(int line) case RDRecording::DeviceBusy: case RDRecording::NoCut: case RDRecording::UnknownFormat: - d_texts[line][29]=RDRecording::exitString(code); + d_texts[line][22]=RDRecording::exitString(code); d_back_colors[line]=QColor(EVENT_ERROR_COLOR); break; case RDRecording::ServerError: case RDRecording::InternalError: - d_texts[line][29]=RDRecording::exitString(code)+": "+err_text; + d_texts[line][22]=RDRecording::exitString(code)+": "+err_text; d_back_colors[line]=QColor(EVENT_ERROR_COLOR); break; }