diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-16 23:33:42 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-16 23:33:42 +0000 |
| commit | 847f0e85e8b0c8135294258a9507fba03cc1cc30 (patch) | |
| tree | 0a74838023ea90c3bb53c7c4f737bab5dc84e427 /src/input/input_v4l.c | |
| parent | b88ff04361ced758928d2ad8b87cb8986d044a35 (diff) | |
| download | xine-lib-847f0e85e8b0c8135294258a9507fba03cc1cc30.tar.gz xine-lib-847f0e85e8b0c8135294258a9507fba03cc1cc30.tar.bz2 | |
New stream/meta info (safe) stuff.
BIG NOTE: use helpers to access to these informations (get/set/reset):
_x_{stream,meta}_info_{get,set,reset}()
are for internal use, don't use *_public() ones from inside the beast ;-)
Some wrongly names "xine_" fonction renaming.
CVS patchset: 5757
CVS date: 2003/11/16 23:33:42
Diffstat (limited to 'src/input/input_v4l.c')
| -rw-r--r-- | src/input/input_v4l.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 783c6a52b..e6a17f3dc 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -748,11 +748,11 @@ static int open_radio_capture_device(v4l_input_plugin_t *this) if (set_input_source(this, this->tuner_name) > 0) tuner_found = 1; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, periods); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, bits); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, periods); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, bits); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, rate); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); /* * Pre allocate some frames for audio and video. This way this hasn't to be @@ -861,13 +861,13 @@ static int open_video_capture_device(v4l_input_plugin_t *this) return 0; } - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, resolutions[j].width); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, resolutions[j].height); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, periods); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, bits); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, resolutions[j].width); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, resolutions[j].height); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, periods); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, bits); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, rate); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); /* * Pre allocate some frames for audio and video. This way this hasn't to be @@ -1013,8 +1013,8 @@ static int open_video_capture_device(v4l_input_plugin_t *this) } /* Save dimensions */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, resolutions[j].width); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, resolutions[j].height); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, resolutions[j].width); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, resolutions[j].height); /* Using deinterlaceing is highly recommended. Setting to true */ this->old_interlace = |