diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-11-19 09:41:22 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-11-26 07:44:19 +0100 |
| commit | af66e03edd4d46c7c37f6360dab3ed5953f36943 (patch) | |
| tree | 8af4a3de0fbddc4af5a24ec3ab0938fabb7dbcde | |
| parent | 31e82355a14ede525b96e1f300acebb29052915f (diff) | |
| download | linux-stable-af66e03edd4d46c7c37f6360dab3ed5953f36943.tar.gz linux-stable-af66e03edd4d46c7c37f6360dab3ed5953f36943.tar.bz2 linux-stable-af66e03edd4d46c7c37f6360dab3ed5953f36943.zip | |
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: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/media/test-drivers/vidtv/vidtv_channel.c | 2 | ||||
| -rw-r--r-- | drivers/media/test-drivers/vidtv/vidtv_s302m.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/test-drivers/vidtv/vidtv_channel.c b/drivers/media/test-drivers/vidtv/vidtv_channel.c index ddfeecd381e6..f64a68dea234 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_channel.c +++ b/drivers/media/test-drivers/vidtv/vidtv_channel.c @@ -61,7 +61,7 @@ struct vidtv_channel char *provider = ENCODING_ISO8859_15 "LinuxTV.org"; char *iso_language_code = ENCODING_ISO8859_15 "eng"; 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; struct vidtv_channel *s302m; struct vidtv_s302m_encoder_init_args encoder_args = {}; diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.c b/drivers/media/test-drivers/vidtv/vidtv_s302m.c index 146e4e9d361b..cbf89530aafe 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_s302m.c +++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.c @@ -79,7 +79,7 @@ struct tone_duration { }; #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_DS_6, 128}, { NOTE_E_6, 128}, { NOTE_B_5, 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) if (!e->src_buf) { /* * Simple tone generator: play the tones at the - * beethoven_5th_symphony array. + * beethoven_fur_elise array. */ 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; - ctx->last_tone = beethoven_5th_symphony[e->src_buf_offset].note; - ctx->last_duration = beethoven_5th_symphony[e->src_buf_offset].duration * + ctx->last_tone = beethoven_fur_elise[e->src_buf_offset].note; + ctx->last_duration = beethoven_fur_elise[e->src_buf_offset].duration * S302M_SAMPLING_RATE_HZ / COMPASS / 5; e->src_buf_offset++; ctx->note_offset = 0; |