diff options
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | ToDo | 10 | ||||
| -rw-r--r-- | audiorecorder.c | 12 | ||||
| -rw-r--r-- | contrib/audiorecorder.conf | 115 | ||||
| -rw-r--r-- | setup.c | 6 | ||||
| -rw-r--r-- | setup.h | 3 |
6 files changed, 127 insertions, 24 deletions
diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..5bc7d65 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,5 @@ +* audiorecorder-2.0.0_rc5 +- extended audiorecoder.conf, thanks to wolfi.m @ vdrportal.de +- removed mp3 codec, not available, not needed, plugin use only libmp3lame for encoding to .mp3 files + (audiorecorder.c, setup.c, setup.h) + this fix the false/positiv error "...is not compiled with mp3 support.." @@ -0,0 +1,10 @@ +- es werden keine .mp2 files erstellt bei auswahl mp2 im OSD plugin setup + fehler: das kopieren von .tmp.m2 files functioniert nicht ( convert.c ) + es wird keine dir ARTIST/TITLE.mp2 erstellt + braucht irgendwer eigentlich .mp2 files??? + es sollte reichen wenn die auswahl mp2 im OSD plugin setup enfernt wird, so dass das plugin + only fuer mp3 functioniert + +- fix deprecated warnings, obsolete in (libav-10, ffmepg-2.?.?) + convert to use avcodec_decode_audio4 (convert.c) + convert to use avcodec_encode_audio2 (convert.c)
\ No newline at end of file diff --git a/audiorecorder.c b/audiorecorder.c index b7d60b1..0bcf686 100644 --- a/audiorecorder.c +++ b/audiorecorder.c @@ -151,16 +151,11 @@ bool cPluginAudiorecorder::Initialize(void) audio_codecs[0] = "mp2"; audio_codecs[1] = "libmp3lame"; - audio_codecs[2] = "mp3"; -/* ToDo - was soll audio_codecs[2] bewirken? - for mp3 encoding wird libmp3lame( external lib von lame) benutzt - ffmpeg, libav hat keine interne mp3 encode function - may be obsoleted codec from very, very old ffmpeg? -*/ +// audio_codecs[2] = "mp3"; // not needed, used + audio_codecs_translated[0] = tr("mp2"); audio_codecs_translated[1] = tr("mp3"); - audio_codecs_translated[2] = tr("mp3"); +// audio_codecs_translated[2] = tr("mp3"); // not needed, used fade_types[0] = tr("off"); fade_types[1] = tr("linear"); @@ -332,7 +327,6 @@ void cPluginAudiorecorder::probe_audio_codecs() { AVCodec *codec = NULL; for (c = 1; c < SetupValues.num_audio_codecs; ++c) { -// codec = avcodec_find_encoder(AV_CODEC_ID_MP3); /* codec hard enabled for libmp3 debug */ codec = avcodec_find_encoder_by_name(audio_codecs[c]); if (codec) continue; diff --git a/contrib/audiorecorder.conf b/contrib/audiorecorder.conf index 548fe26..cacfc14 100644 --- a/contrib/audiorecorder.conf +++ b/contrib/audiorecorder.conf @@ -1,12 +1,103 @@ -S19.2E-1-1093-28406 /* DAS MODUL */ -S19.2E-1-1093-28475 /* Eins Live */ -S19.2E-1-1093-28476 /* WDR 2 */ -S19.2E-1-1093-28468 /* SWR 3 */ -S19.2E-1-1093-28423 /* YOU FM */ -S19.2E-1-1093-28450 /* Bremen Vier */ -S19.2E-1-1093-28402 /* Bayern 3 */ -S19.2E-1-1093-28437 /* NDR 2 */ -S19.2E-1-1093-28440 /* N-JOY */ -S19.2E-1-1093-28420 /* hr2 */ -S19.2E-1-1093-28421 /* hr3 */ -S19.2E-1-1093-28419 /* hr1 */ +#S19.2E-1-1093-28465 /* SWR1 BW;ARD SWR */ +#S19.2E-1-1093-28467 /* SWR2;ARD SWR */ +#S19.2E-1-1093-28468 /* SWR3;ARD SWR */ +#S19.2E-1-1093-28471 /* DASDING;ARD SWR */ +#S19.2E-1-1093-28469 /* SWR4 BW;ARD SWR */ +#S19.2E-1-1093-28470 /* SWR4 RP;ARD SWR */ +#S19.2E-1-1093-28472 /* SWRinfo;ARD SWR */ +#S19.2E-1-1093-28466 /* SWR1 RP;ARD SWR */ +#S19.2E-1-1093-28400 /* Bayern 1;ARD BR */ +#S19.2E-1-1093-28401 /* Bayern 2;ARD BR */ +#S19.2E-1-1093-28402 /* BAYERN 3;ARD BR */ +#S19.2E-133-7-170 /* ANTENNE BAYERN,ANTENNE;BetaDigital */ +#S19.2E-1-1093-28406 /* PULS;ARD BR */ +#S19.2E-1-1093-28404 /* B5 aktuell;ARD BR */ +#S19.2E-1-1093-28408 /* B5 plus;ARD BR */ +#S19.2E-1-1093-28405 /* BAYERN plus;ARD BR */ +#S19.2E-1-1093-28403 /* BR-KLASSIK;ARD BR */ +#S19.2E-1-1093-28444 /* NDR 1 Nieders.;ARD NDR */ +#S19.2E-1-1093-28443 /* NDR 1 Radio MV;ARD NDR */ +#S19.2E-1-1093-28437 /* NDR 2;ARD NDR */ +#S19.2E-1-1093-28441 /* NDR 90,3,;ARD NDR */ +#S19.2E-1-1093-28446 /* NDR Blue;ARD NDR */ +#S19.2E-1-1093-28440 /* N-JOY;ARD NDR */ +#S19.2E-1-1093-28439 /* NDR Info;ARD NDR */ +#S19.2E-1-1093-28445 /* NDR Info Spez.;ARD NDR */ +#S19.2E-1-1093-28438 /* NDR Kultur;ARD NDR */ +#S19.2E-1-1093-28442 /* NDR1WelleNord;ARD NDR */ +#S19.2E-1-1093-28419 /* hr1;ARD HR */ +#S19.2E-1-1093-28420 /* hr2;ARD HR */ +#S19.2E-1-1093-28421 /* hr3;ARD HR */ +#S19.2E-1-1093-28422 /* hr4;ARD HR */ +#S19.2E-1-1093-28424 /* hr-iNFO;ARD HR */ +#S19.2E-1-1093-28423 /* YOU FM;ARD HR */ +#S19.2E-1-1113-12658 /* SCHLAGERPARADIES;MEDIA BROADCAST */ +#S19.2E-133-5-171 /* domradio;BetaDigital */ +#S19.2E-133-5-172 /* egoFM;BetaDigital */ +#S19.2E-1-1113-12654 /* ffn digital;MEDIA BROADCAST */ +#S19.2E-1-1113-12662 /* harmony.fm;MEDIA BROADCAST */ +#S19.2E-1-1113-12660 /* HIT RADIO FFH;MEDIA BROADCAST */ +#S19.2E-133-5-175 /* HOPE Channel Radio,HOPE Ch;BetaDigital */ +#S19.2E-1-1113-12651 /* Inselradio;MEDIA BROADCAST */ +#S19.2E-133-5-177 /* JAM FM;BetaDigital */ +#S19.2E-133-5-173 /* Klassik Radio,Klassik;BetaDigital */ +#S19.2E-1-1113-12655 /* Radio Paloma;MEDIA BROADCAST */ +#S19.2E-1-1113-12663 /* Radio Regenbogen;MEDIA BROADCAST */ +#S19.2E-1-1113-12653 /* radio top40;MEDIA BROADCAST */ +#S19.2E-133-7-160 /* ROCK ANTENNE,ROCK ANT;BetaDigital */ +#S19.2E-53-1097-2052 /* RTL 1440;CANALDIGITAAL */ +#S19.2E-53-1097-2051 /* RTL RADIO;CANALDIGITAAL */ +#S19.2E-133-7-169 /* sunshine live,sunshine;BetaDigital */ +#S19.2E-1-1093-28475 /* 1LIVE;ARD WDR */ +#S19.2E-1-1093-28481 /* 1LIVE diggi;ARD WDR */ +#S19.2E-1-1093-28482 /* KIRAKA;ARD WDR */ +#S19.2E-1-1093-28476 /* WDR 2;ARD WDR */ +#S19.2E-1-1093-28477 /* WDR 3;ARD WDR */ +#S19.2E-1-1093-28478 /* WDR 4;ARD WDR */ +#S19.2E-1-1093-28479 /* WDR 5;ARD WDR */ +#S19.2E-1-1093-28483 /* WDR Event;ARD WDR */ +#S19.2E-1-1093-28480 /* WDR Funkhaus Europa;ARD WDR */ +#S19.2E-1-1093-28431 /* MDR FIGARO;ARD MDR */ +#S19.2E-1-1093-28434 /* MDR INFO;ARD MDR */ +#S19.2E-1-1093-28432 /* MDR JUMP;ARD MDR */ +#S19.2E-1-1093-28435 /* MDR KLASSIK;ARD MDR */ +#S19.2E-1-1093-28429 /* MDR S-ANHALT;ARD MDR */ +#S19.2E-1-1093-28433 /* MDR SPUTNIK;ARD MDR */ +#S19.2E-1-1093-28430 /* MDR THÜRINGEN;ARD MDR */ +#S19.2E-1-1093-28428 /* MDR1 SACHSEN;ARD MDR */ +#S19.2E-1-1093-28454 /* Antenne Brandenburg;ARD rbb */ +#S19.2E-1-1093-28457 /* Fritz;ARD rbb */ +#S19.2E-1-1093-28452 /* Inforadio;ARD rbb */ +#S19.2E-1-1093-28453 /* Kulturradio;ARD rbb */ +#S19.2E-1-1093-28455 /* radioBERLIN 88,8,;ARD rbb */ +#S19.2E-1-1093-28456 /* radioeins;ARD rbb */ +#S19.2E-1-1093-28448 /* Bremen Eins;ARD RB */ +#S19.2E-1-1093-28450 /* Bremen Vier;ARD RB */ +#S19.2E-1-1093-28449 /* Nordwestradio;ARD RB */ +#S19.2E-1-1093-28461 /* SR 1 Europawelle;ARD SR */ +#S19.2E-1-1093-28462 /* SR 2 KulturRadio;ARD SR */ +#S19.2E-1-1093-28463 /* SR 3 Saarlandwelle;ARD SR */ +#S19.2E-1-1079-28012 /* DKULTUR;ZDFvision */ +#S19.2E-1-1115-13121 /* OE1;ORF */ +#S19.2E-1-1115-13122 /* OE1 DD;ORF */ +#S19.2E-1-1115-13123 /* OE2 W;ORF */ +#S19.2E-1-1115-13124 /* OE2 N;ORF */ +#S19.2E-1-1115-13125 /* OE2 B;ORF */ +#S19.2E-1-1115-13126 /* OE2 O;ORF */ +#S19.2E-1-1115-13127 /* OE2 S;ORF */ +#S19.2E-1-1115-13128 /* OE2 T;ORF */ +#S19.2E-1-1115-13129 /* OE2 V;ORF */ +#S19.2E-1-1115-13130 /* OE2 St;ORF */ +#S19.2E-1-1115-13131 /* OE2 K;ORF */ +#S19.2E-1-1115-13133 /* OE3;ORF */ +#S19.2E-1-1115-13134 /* FM4;ORF */ +#S19.2E-1-1115-13136 /* U1 Tirol;U1 Tirol */ +#S19.2E-1-1117-13013 /* HITRADIO OE3;ORF */ +#S19.2E-1-1117-13014 /* ORF2E;ORF */ +#S19.2E-1-1079-28015 /* DRadio DokDeb;ZDFvision */ +#S19.2E-1-1037-5281 /* NL-Radio 1;CANALDIGITAAL */ +#S19.2E-1-1037-5282 /* NL-Radio 2;CANALDIGITAAL */ +#S19.2E-1-1037-5283 /* NL-3FM;CANALDIGITAAL */ +#S19.2E-1-1037-5284 /* NL-Radio 4;CANALDIGITAAL */ +#S19.2E-1-1037-5285 /* NL-Radio 5;CANALDIGITAAL */ +#S19.2E-1-1037-5286 /* NL-Radio 6;CANALDIGITAAL */ @@ -25,9 +25,11 @@ struct setup_values SetupValues = { }; -const char *audio_codecs[NUM_CODECS] = { "mp2", "libmp3lame", "mp3" }; +//const char *audio_codecs[NUM_CODECS] = { "mp2", "libmp3lame", "mp3" }; +const char *audio_codecs[NUM_CODECS] = { "mp2", "libmp3lame" }; -const char *audio_codecs_translated[NUM_CODECS] = { tr("mp2"), tr("mp3"), tr("mp3") }; +//const char *audio_codecs_translated[NUM_CODECS] = { tr("mp2"), tr("mp3"), tr("mp3") }; +const char *audio_codecs_translated[NUM_CODECS] = { tr("mp2"), tr("mp3") }; const char *fade_types[NUM_FADE_TYPES] = { tr("off"), tr("linear"), tr("exponential") }; @@ -31,7 +31,8 @@ struct setup_values { extern struct setup_values SetupValues; -#define NUM_CODECS 3 +//#define NUM_CODECS 3 +#define NUM_CODECS 2 extern const char *audio_codecs[NUM_CODECS]; extern const char *audio_codecs_translated[NUM_CODECS]; |