From 677f7824d8d4f28020f7ae16801416142ceb4358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=81=93=E7=94=AB?= <lidf@ahtelit.com>
Date: Wed, 29 May 2024 13:22:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85C=20API=E6=8B=89?=
 =?UTF-8?q?=E6=B5=81=E4=BB=A3=E7=90=86=E7=BC=BA=E5=B0=91retry=5Fcount?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E6=AC=A1=E6=95=B0=E9=85=8D=E7=BD=AE=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BD=E6=95=B0=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/include/mk_proxyplayer.h  | 21 +++++++++++----------
 api/source/mk_proxyplayer.cpp |  8 ++++----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/api/include/mk_proxyplayer.h b/api/include/mk_proxyplayer.h
index ab424d42..1f66abc5 100644
--- a/api/include/mk_proxyplayer.h
+++ b/api/include/mk_proxyplayer.h
@@ -33,6 +33,17 @@ typedef struct mk_proxy_player_t *mk_proxy_player;
 API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create(const char *vhost, const char *app, const char *stream, int hls_enabled, int mp4_enabled);
 
 
+/**
+ * 创建一个代理播放器
+ * @param vhost 虚拟主机名，一般为__defaultVhost__
+ * @param app 应用名
+ * @param stream 流名
+ * @param option ProtocolOption相关配置
+ * @return 对象指针
+ */
+API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create2(const char *vhost, const char *app, const char *stream, mk_ini option);
+
+
 /**
  * 创建一个代理播放器
  * @param vhost 虚拟主机名，一般为__defaultVhost__
@@ -46,16 +57,6 @@ API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create(const char *vhost, co
  */
 API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create3(const char *vhost, const char *app, const char *stream, int hls_enabled, int mp4_enabled, int retry_count);
 
-/**
- * 创建一个代理播放器
- * @param vhost 虚拟主机名，一般为__defaultVhost__
- * @param app 应用名
- * @param stream 流名
- * @param option ProtocolOption相关配置
- * @return 对象指针
- */
-API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create2(const char *vhost, const char *app, const char *stream, mk_ini option);
-
 
 /**
  * 创建一个代理播放器
diff --git a/api/source/mk_proxyplayer.cpp b/api/source/mk_proxyplayer.cpp
index 2be5ca17..af73c013 100644
--- a/api/source/mk_proxyplayer.cpp
+++ b/api/source/mk_proxyplayer.cpp
@@ -19,6 +19,10 @@ API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create(const char *vhost, co
    return mk_proxy_player_create3(vhost, app, stream, hls_enabled, mp4_enabled,-1);
 }
 
+API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create2(const char *vhost, const char *app, const char *stream, mk_ini ini) {
+    return mk_proxy_player_create4(vhost, app, stream, ini, -1);
+}
+
 API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create3(const char *vhost, const char *app, const char *stream, int hls_enabled, int mp4_enabled, int retry_count) {
     assert(vhost && app && stream);
     ProtocolOption option;
@@ -28,10 +32,6 @@ API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create3(const char *vhost, c
     return (mk_proxy_player)obj;
 }
 
-API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create2(const char *vhost, const char *app, const char *stream, mk_ini ini) {
-    return mk_proxy_player_create4(vhost, app, stream, ini, -1);
-}
-
 
 API_EXPORT mk_proxy_player API_CALL mk_proxy_player_create4(const char *vhost, const char *app, const char *stream, mk_ini ini, int retry_count) {
     assert(vhost && app && stream);