diff options
| author | Tuomas Virtanen <katajakasa@gmail.com> | 2018-03-26 18:24:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 18:24:54 +0300 |
| commit | cd9cdcb9fbc6bbea56e28eb9e4e13f7036004266 (patch) | |
| tree | 39e5197565c33d5227ded4bed435a4d95998bf0b /src/kitsource.c | |
| parent | 48c7daa8e91d96805548ef4d2fa9f4b925c26108 (diff) | |
| parent | 9777f2b386f7846fe5ebfe04d3086c157baea2db (diff) | |
Merge pull request #27 from katajakasa/ttv-split-player
PR for SDL_kitchensink v1
Diffstat (limited to 'src/kitsource.c')
| -rw-r--r-- | src/kitsource.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/kitsource.c b/src/kitsource.c index 075bcbd..9e47dcc 100644 --- a/src/kitsource.c +++ b/src/kitsource.c @@ -1,13 +1,13 @@ -#include "kitchensink/kitsource.h" -#include "kitchensink/kiterror.h" +#include <stdlib.h> +#include <string.h> +#include <assert.h> #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> #include <libavutil/opt.h> -#include <stdlib.h> -#include <string.h> -#include <assert.h> +#include "kitchensink/kitsource.h" +#include "kitchensink/kiterror.h" Kit_Source* Kit_CreateSourceFromUrl(const char *url) { assert(url != NULL); @@ -34,9 +34,9 @@ Kit_Source* Kit_CreateSourceFromUrl(const char *url) { } // Find best streams for defaults - src->astream_idx = Kit_GetBestSourceStream(src, KIT_STREAMTYPE_AUDIO); - src->vstream_idx = Kit_GetBestSourceStream(src, KIT_STREAMTYPE_VIDEO); - src->sstream_idx = Kit_GetBestSourceStream(src, KIT_STREAMTYPE_SUBTITLE); + src->audio_stream_index = Kit_GetBestSourceStream(src, KIT_STREAMTYPE_AUDIO); + src->video_stream_index = Kit_GetBestSourceStream(src, KIT_STREAMTYPE_VIDEO); + src->subtitle_stream_index = Kit_GetBestSourceStream(src, KIT_STREAMTYPE_SUBTITLE); return src; exit_1: @@ -102,9 +102,9 @@ int Kit_GetBestSourceStream(const Kit_Source *src, const Kit_StreamType type) { int Kit_SetSourceStream(Kit_Source *src, const Kit_StreamType type, int index) { assert(src != NULL); switch(type) { - case KIT_STREAMTYPE_AUDIO: src->astream_idx = index; break; - case KIT_STREAMTYPE_VIDEO: src->vstream_idx = index; break; - case KIT_STREAMTYPE_SUBTITLE: src->sstream_idx = index; break; + case KIT_STREAMTYPE_AUDIO: src->audio_stream_index = index; break; + case KIT_STREAMTYPE_VIDEO: src->video_stream_index = index; break; + case KIT_STREAMTYPE_SUBTITLE: src->subtitle_stream_index = index; break; default: Kit_SetError("Invalid stream type"); return 1; @@ -115,9 +115,9 @@ int Kit_SetSourceStream(Kit_Source *src, const Kit_StreamType type, int index) { int Kit_GetSourceStream(const Kit_Source *src, const Kit_StreamType type) { assert(src != NULL); switch(type) { - case KIT_STREAMTYPE_AUDIO: return src->astream_idx; - case KIT_STREAMTYPE_VIDEO: return src->vstream_idx; - case KIT_STREAMTYPE_SUBTITLE: return src->sstream_idx; + case KIT_STREAMTYPE_AUDIO: return src->audio_stream_index; + case KIT_STREAMTYPE_VIDEO: return src->video_stream_index; + case KIT_STREAMTYPE_SUBTITLE: return src->subtitle_stream_index; default: break; } |