Commit af66e03e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: vidtv: fix the name of the program

While the original plan was to use the first movement of
the 5th Symphony, it was opted to use the Für Elise song,
instead.

Fix it.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 31e82355
...@@ -61,7 +61,7 @@ struct vidtv_channel ...@@ -61,7 +61,7 @@ struct vidtv_channel
char *provider = ENCODING_ISO8859_15 "LinuxTV.org"; char *provider = ENCODING_ISO8859_15 "LinuxTV.org";
char *iso_language_code = ENCODING_ISO8859_15 "eng"; char *iso_language_code = ENCODING_ISO8859_15 "eng";
char *event_name = ENCODING_ISO8859_15 "Beethoven Music"; char *event_name = ENCODING_ISO8859_15 "Beethoven Music";
char *event_text = ENCODING_ISO8859_15 "Beethoven's 5th Symphony"; char *event_text = ENCODING_ISO8859_15 "Beethoven's Für Elise";
const u16 s302m_beethoven_event_id = 1; const u16 s302m_beethoven_event_id = 1;
struct vidtv_channel *s302m; struct vidtv_channel *s302m;
struct vidtv_s302m_encoder_init_args encoder_args = {}; struct vidtv_s302m_encoder_init_args encoder_args = {};
......
...@@ -79,7 +79,7 @@ struct tone_duration { ...@@ -79,7 +79,7 @@ struct tone_duration {
}; };
#define COMPASS 120 /* beats per minute (Allegro) */ #define COMPASS 120 /* beats per minute (Allegro) */
static const struct tone_duration beethoven_5th_symphony[] = { static const struct tone_duration beethoven_fur_elise[] = {
{ NOTE_E_6, 128}, { NOTE_DS_6, 128}, { NOTE_E_6, 128}, { NOTE_E_6, 128}, { NOTE_DS_6, 128}, { NOTE_E_6, 128},
{ NOTE_DS_6, 128}, { NOTE_E_6, 128}, { NOTE_B_5, 128}, { NOTE_DS_6, 128}, { NOTE_E_6, 128}, { NOTE_B_5, 128},
{ NOTE_D_6, 128}, { NOTE_C_6, 128}, { NOTE_A_3, 128}, { NOTE_D_6, 128}, { NOTE_C_6, 128}, { NOTE_A_3, 128},
...@@ -238,14 +238,14 @@ static u16 vidtv_s302m_get_sample(struct vidtv_encoder *e) ...@@ -238,14 +238,14 @@ static u16 vidtv_s302m_get_sample(struct vidtv_encoder *e)
if (!e->src_buf) { if (!e->src_buf) {
/* /*
* Simple tone generator: play the tones at the * Simple tone generator: play the tones at the
* beethoven_5th_symphony array. * beethoven_fur_elise array.
*/ */
if (ctx->last_duration <= 0) { if (ctx->last_duration <= 0) {
if (e->src_buf_offset >= ARRAY_SIZE(beethoven_5th_symphony)) if (e->src_buf_offset >= ARRAY_SIZE(beethoven_fur_elise))
e->src_buf_offset = 0; e->src_buf_offset = 0;
ctx->last_tone = beethoven_5th_symphony[e->src_buf_offset].note; ctx->last_tone = beethoven_fur_elise[e->src_buf_offset].note;
ctx->last_duration = beethoven_5th_symphony[e->src_buf_offset].duration * ctx->last_duration = beethoven_fur_elise[e->src_buf_offset].duration *
S302M_SAMPLING_RATE_HZ / COMPASS / 5; S302M_SAMPLING_RATE_HZ / COMPASS / 5;
e->src_buf_offset++; e->src_buf_offset++;
ctx->note_offset = 0; ctx->note_offset = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment