Skip to content

Commit af66e03

Browse files
committed
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>
1 parent 31e8235 commit af66e03

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/media/test-drivers/vidtv/vidtv_channel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ struct vidtv_channel
6161
char *provider = ENCODING_ISO8859_15 "LinuxTV.org";
6262
char *iso_language_code = ENCODING_ISO8859_15 "eng";
6363
char *event_name = ENCODING_ISO8859_15 "Beethoven Music";
64-
char *event_text = ENCODING_ISO8859_15 "Beethoven's 5th Symphony";
64+
char *event_text = ENCODING_ISO8859_15 "Beethoven's Für Elise";
6565
const u16 s302m_beethoven_event_id = 1;
6666
struct vidtv_channel *s302m;
6767
struct vidtv_s302m_encoder_init_args encoder_args = {};

drivers/media/test-drivers/vidtv/vidtv_s302m.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ struct tone_duration {
7979
};
8080

8181
#define COMPASS 120 /* beats per minute (Allegro) */
82-
static const struct tone_duration beethoven_5th_symphony[] = {
82+
static const struct tone_duration beethoven_fur_elise[] = {
8383
{ NOTE_E_6, 128}, { NOTE_DS_6, 128}, { NOTE_E_6, 128},
8484
{ NOTE_DS_6, 128}, { NOTE_E_6, 128}, { NOTE_B_5, 128},
8585
{ 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)
238238
if (!e->src_buf) {
239239
/*
240240
* Simple tone generator: play the tones at the
241-
* beethoven_5th_symphony array.
241+
* beethoven_fur_elise array.
242242
*/
243243
if (ctx->last_duration <= 0) {
244-
if (e->src_buf_offset >= ARRAY_SIZE(beethoven_5th_symphony))
244+
if (e->src_buf_offset >= ARRAY_SIZE(beethoven_fur_elise))
245245
e->src_buf_offset = 0;
246246

247-
ctx->last_tone = beethoven_5th_symphony[e->src_buf_offset].note;
248-
ctx->last_duration = beethoven_5th_symphony[e->src_buf_offset].duration *
247+
ctx->last_tone = beethoven_fur_elise[e->src_buf_offset].note;
248+
ctx->last_duration = beethoven_fur_elise[e->src_buf_offset].duration *
249249
S302M_SAMPLING_RATE_HZ / COMPASS / 5;
250250
e->src_buf_offset++;
251251
ctx->note_offset = 0;

0 commit comments

Comments
 (0)