From 2bedf377cedbc6e10bca1ec4f8faeecaf5d56412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Thu, 1 Sep 2011 21:11:06 +0300
Subject: [PATCH] Rename i_audio_mode to i_tuner_audio_mode
i_audio_mode should be used for the audio input mode (if ever supported).
---
modules/access/v4l2.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 1a0b49ad4b44..cd81d33b0b1f 100644
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -597,7 +597,7 @@ struct demux_sys_t
uint32_t i_tuner;
enum v4l2_tuner_type i_tuner_type;
int i_frequency;
- int i_audio_mode;
+ int i_tuner_audio_mode;
/* Controls */
char *psz_set_ctrls;
@@ -693,7 +693,7 @@ static void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj )
p_sys->i_tuner = var_CreateGetInteger( p_obj, "v4l2-tuner" );
p_sys->i_tuner_type = V4L2_TUNER_RADIO; /* non-trap default value */
p_sys->i_frequency = var_CreateGetInteger( p_obj, "v4l2-tuner-frequency" );
- p_sys->i_audio_mode = var_CreateGetInteger( p_obj, "v4l2-tuner-audio-mode" );
+ p_sys->i_tuner_audio_mode = var_CreateGetInteger( p_obj, "v4l2-tuner-audio-mode" );
p_sys->psz_set_ctrls = var_CreateGetString( p_obj, "v4l2-set-ctrls" );
@@ -1607,11 +1607,11 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
}
/* Set the tuner's audio mode */
- if( p_sys->i_audio_mode >= 0 )
+ if( p_sys->i_tuner_audio_mode >= 0 )
{
struct v4l2_tuner tuner = {
.index = p_sys->i_tuner,
- .audmode = p_sys->i_audio_mode,
+ .audmode = p_sys->i_tuner_audio_mode,
};
if( v4l2_ioctl( i_fd, VIDIOC_S_TUNER, &tuner ) < 0 )
--
GitLab