From b129a2d84d6db3fff50a8690230050b13753eba6 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 11 Nov 2019 21:38:34 +0100 Subject: [PATCH] Removing an unused parameter. --- Kyoo.Transcoder/include/transcoder.h | 2 +- Kyoo.Transcoder/src/Transcoder.cpp | 2 +- Kyoo/InternalAPI/Transcoder/Transcoder.cs | 2 +- Kyoo/InternalAPI/Transcoder/TranscoderAPI.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Kyoo.Transcoder/include/transcoder.h b/Kyoo.Transcoder/include/transcoder.h index d81413b8..ae76c326 100644 --- a/Kyoo.Transcoder/include/transcoder.h +++ b/Kyoo.Transcoder/include/transcoder.h @@ -11,7 +11,7 @@ extern "C" API int Init(); -extern "C" API int transmux(const char *path, const char *outPath, const char *stream_uri); +extern "C" API int transmux(const char *path, const char *outPath); //Take the path of the file and the path of the output directory. It will return the list of subtitle streams in the streams variable. The int returned is the number of subtitles extracted. extern "C" API Stream* extract_subtitles(const char *path, const char *outPath, int *streamCount, int *subtitleCount); diff --git a/Kyoo.Transcoder/src/Transcoder.cpp b/Kyoo.Transcoder/src/Transcoder.cpp index b0dbe82f..51d1c18f 100644 --- a/Kyoo.Transcoder/src/Transcoder.cpp +++ b/Kyoo.Transcoder/src/Transcoder.cpp @@ -8,7 +8,7 @@ int Init() return sizeof(Stream); } -int transmux(const char *path, const char *out_path, const char *stream_uri) +int transmux(const char *path, const char *out_path) { AVFormatContext *in_ctx = NULL; AVFormatContext *out_ctx = NULL; diff --git a/Kyoo/InternalAPI/Transcoder/Transcoder.cs b/Kyoo/InternalAPI/Transcoder/Transcoder.cs index 34ba70e8..cc68b44d 100644 --- a/Kyoo/InternalAPI/Transcoder/Transcoder.cs +++ b/Kyoo/InternalAPI/Transcoder/Transcoder.cs @@ -40,7 +40,7 @@ namespace Kyoo.InternalAPI Debug.WriteLine("&Transmuxing " + episode.Link + " at " + episode.Path + ", outputPath: " + folder); //FFMPEG require us to put DirectorySeparaorChar as '/' for his internal regex. - if (File.Exists(manifest) || TranscoderAPI.transmux(episode.Path, manifest.Replace('\\', '/'), (folder + Path.DirectorySeparatorChar).Replace('\\', '/')) == 0) + if (File.Exists(manifest) || TranscoderAPI.transmux(episode.Path, manifest.Replace('\\', '/')) == 0) return manifest; else return null; diff --git a/Kyoo/InternalAPI/Transcoder/TranscoderAPI.cs b/Kyoo/InternalAPI/Transcoder/TranscoderAPI.cs index 910e12d7..015ccd94 100644 --- a/Kyoo/InternalAPI/Transcoder/TranscoderAPI.cs +++ b/Kyoo/InternalAPI/Transcoder/TranscoderAPI.cs @@ -14,7 +14,7 @@ namespace Kyoo.InternalAPI.TranscoderLink public extern static int Init(); [DllImport(TranscoderPath, CallingConvention = CallingConvention.Cdecl)] - public extern static int transmux(string path, string out_path, string stream_uri); + public extern static int transmux(string path, string out_path); [DllImport(TranscoderPath, CallingConvention = CallingConvention.Cdecl)] private extern static IntPtr extract_subtitles(string path, string out_path, out int array_length, out int track_count);