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

2015-08-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added an 'RDAudioConvert::Stage3Pcm24()' method in
	'lib/rdaudioconvert.cpp' and 'lib/rdaudioconvert.h'.
	* Added a 'Format::Pcm24' value to the 'RDSettings::Format'
	enumeration in 'lib/rdsettings.h'.
	* Modified the 'RDAudioConvert' class to support generating PCM24
	output in 'lib/rdaudioconvert.cpp' and 'lib/rdaudioconvert.h'.
	* Modified the 'RDPlayStream' class to support playing PCM24
	data in 'rdhpi/rdplaystream.cpp'.
	* Modified the 'RDRecordStream' class to support capturing PCM24
	data in 'rdhpi/rdrecordstream.cpp'.
	* Added an 'audio_peaks_test' harness in 'tests/audio_peaks_test.cpp'
	and 'tests/audio_peaks_test.h'.
	* Added 'PCM24' to the list of available formats in
	'rdadmin/edit_rdlibrary.cpp' and 'rdadmin/edit_rdlibrary.h'.
	* Added 'PCM24' to the list of available formats in
	'rdadmin/edit_decks.cpp'.
	* Added PCM24 support for file importation in
	'web/rdxport/import.cpp'.
	* Added an 'RDCae::Pcm24' value to the 'RDCae::AudioCoding
	enumeration in 'lib/rdcae.h'.
This commit is contained in:
Fred Gleason
2015-08-30 07:49:44 -04:00
parent e48a90a363
commit 8d70a79387
45 changed files with 1329 additions and 854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rdadmin/edit_decks.cpp
View File

@@ -2,7 +2,7 @@
//
// Edit a Rivendell RDCatch Deck Configuration
//
// (C) Copyright 2002-2004,2014 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2015 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
@@ -295,6 +295,7 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent)
edit_record_channel=edit_record_deck_box->currentItem()+1;
edit_play_channel=edit_play_deck_box->currentItem()+129;
edit_format_box->insertItem(tr("PCM16"));
edit_format_box->insertItem(tr("PCM24"));
edit_format_box->insertItem(tr("MPEG Layer 2"));
edit_channels_box->insertItem("1");
edit_channels_box->insertItem("2");
@@ -395,14 +396,14 @@ void EditDecks::monitorPortChangedData(int port)
void EditDecks::formatActivatedData(int index)
{
if(index==0) {
edit_bitrate_label->setDisabled(true);
edit_bitrate_box->setDisabled(true);
}
else {
if(index==2) {
edit_bitrate_label->setEnabled(true);
edit_bitrate_box->setEnabled(true);
}
else {
edit_bitrate_label->setDisabled(true);
edit_bitrate_box->setDisabled(true);
}
}
@@ -529,9 +530,14 @@ void EditDecks::ReadRecord(int chan)
edit_bitrate_box->setDisabled(true);
break;
case RDSettings::Pcm24:
edit_format_box->setCurrentItem(1);
edit_bitrate_box->setDisabled(true);
break;
case RDSettings::MpegL2:
case RDSettings::MpegL2Wav:
edit_format_box->setCurrentItem(1);
edit_format_box->setCurrentItem(2);
edit_bitrate_box->setEnabled(true);
break;
@@ -638,12 +644,17 @@ void EditDecks::WriteRecord(int chan)
}
}
switch(edit_format_box->currentItem()) {
case 0:
edit_record_deck->setDefaultFormat(RDSettings::Pcm16);
break;
case 1:
edit_record_deck->setDefaultFormat(RDSettings::MpegL2);
break;
case 0:
edit_record_deck->setDefaultFormat(RDSettings::Pcm16);
break;
case 1:
edit_record_deck->setDefaultFormat(RDSettings::Pcm24);
break;
case 2:
edit_record_deck->setDefaultFormat(RDSettings::MpegL2);
break;
}
edit_record_deck->setDefaultChannels(edit_channels_box->currentItem()+1);
sscanf((const char *)edit_bitrate_box->currentText(),"%d",&temp);