Skip to content

Commit afe7eca

Browse files
committed
Version 4.2.0
1 parent e810225 commit afe7eca

File tree

11 files changed

+35
-47
lines changed

11 files changed

+35
-47
lines changed

Demo/Vitamio-Demo/PlayerController.m

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ - (void)viewDidLoad
6565

6666
if (!mMPayer) {
6767
mMPayer = [VMediaPlayer sharedInstance];
68-
NSString *akey = @"wn9iKq0p9JSMfWz3G78ZvtlN";
69-
NSString *skey = @"348b3e1ed183154034ce49decc8e1d69";
70-
[mMPayer setupPlayerWithCarrierView:self.carrier withDelegate:self withAppKey:akey withSecretKey:skey];
68+
[mMPayer setupPlayerWithCarrierView:self.carrier withDelegate:self];
7169
[self setupObservers];
7270
}
7371
}

Doc/com.yixia.Vitamio.docset/Contents/Resources/Documents/Classes/VMediaPlayer.html

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ <h1 class="hideInXcode">VMediaPlayer Class Reference</h1>
5959

6060
<option value="instance_methods">Instance Methods</option>
6161

62-
<option value="//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">&nbsp;&nbsp;&nbsp;&nbsp;- setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</option>
62+
<option value="//api/name/setupPlayerWithCarrierView:withDelegate:">&nbsp;&nbsp;&nbsp;&nbsp;- setupPlayerWithCarrierView:withDelegate:</option>
6363

6464
<option value="//api/name/unSetupPlayer">&nbsp;&nbsp;&nbsp;&nbsp;- unSetupPlayer</option>
6565

@@ -239,7 +239,7 @@ <h1 class="hideInXcode">VMediaPlayer Class Reference</h1>
239239

240240
<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
241241

242-
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</a></span></li>
242+
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">setupPlayerWithCarrierView:withDelegate:</a></span></li>
243243

244244
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/unSetupPlayer">unSetupPlayer</a></span></li>
245245

@@ -422,7 +422,7 @@ <h3 class="subsubtitle task-title">VMediaPlayer Setup&amp;unSetup Methods</h3>
422422
<ul class="task-list">
423423
<li>
424424
<span class="tooltip">
425-
<code><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">&ndash;&nbsp;setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</a></code>
425+
<code><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">&ndash;&nbsp;setupPlayerWithCarrierView:withDelegate:</a></code>
426426
</span>
427427

428428

@@ -1097,8 +1097,8 @@ <h4 class="method-subtitle">Declared In</h4>
10971097
<h2 class="subtitle subtitle-methods">Instance Methods</h2>
10981098

10991099
<div class="section-method">
1100-
<a name="//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:" title="setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:"></a>
1101-
<h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</h3>
1100+
<a name="//api/name/setupPlayerWithCarrierView:withDelegate:" title="setupPlayerWithCarrierView:withDelegate:"></a>
1101+
<h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:</h3>
11021102

11031103

11041104

@@ -1108,7 +1108,7 @@ <h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:wit
11081108

11091109

11101110

1111-
<div class="method-subsection method-declaration"><code>- (BOOL)setupPlayerWithCarrierView:(UIView *)<em>carrier</em> withDelegate:(id&lt;VMediaPlayerDelegate&gt;)<em>dlg</em> withAppKey:(NSString *)<em>akey</em> withSecretKey:(NSString *)<em>skey</em></code></div>
1111+
<div class="method-subsection method-declaration"><code>- (BOOL)setupPlayerWithCarrierView:(UIView *)<em>carrier</em> withDelegate:(id&lt;VMediaPlayerDelegate&gt;)<em>dlg</em></code></div>
11121112

11131113

11141114

@@ -1120,16 +1120,6 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
11201120
<dd><p>The view of video picture will rendering to.</p></dd>
11211121
</dl>
11221122

1123-
<dl class="argument-def parameter-def">
1124-
<dt><em>akey</em></dt>
1125-
<dd><p>The App-Key.</p></dd>
1126-
</dl>
1127-
1128-
<dl class="argument-def parameter-def">
1129-
<dt><em>skey</em></dt>
1130-
<dd><p>The Secret-Key.</p></dd>
1131-
</dl>
1132-
11331123
<dl class="argument-def parameter-def">
11341124
<dt><em>delegate</em></dt>
11351125
<dd><p>The protocol to setup.</p></dd>
@@ -1202,6 +1192,15 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
12021192

12031193

12041194

1195+
<div class="method-subsection see-also-section">
1196+
<h4 class="method-subtitle">See Also</h4>
1197+
<ul>
1198+
1199+
<li><code><p><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">- setupPlayerWithCarrierView:withDelegate:</a></p></code></li>
1200+
1201+
</ul>
1202+
</div>
1203+
12051204

12061205

12071206
<div class="method-subsection declared-in-section">
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
-51 Bytes
Binary file not shown.

Doc/html/Classes/VMediaPlayer.html

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ <h1 class="hideInXcode">VMediaPlayer Class Reference</h1>
5959

6060
<option value="instance_methods">Instance Methods</option>
6161

62-
<option value="//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">&nbsp;&nbsp;&nbsp;&nbsp;- setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</option>
62+
<option value="//api/name/setupPlayerWithCarrierView:withDelegate:">&nbsp;&nbsp;&nbsp;&nbsp;- setupPlayerWithCarrierView:withDelegate:</option>
6363

6464
<option value="//api/name/unSetupPlayer">&nbsp;&nbsp;&nbsp;&nbsp;- unSetupPlayer</option>
6565

@@ -239,7 +239,7 @@ <h1 class="hideInXcode">VMediaPlayer Class Reference</h1>
239239

240240
<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
241241

242-
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</a></span></li>
242+
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">setupPlayerWithCarrierView:withDelegate:</a></span></li>
243243

244244
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/unSetupPlayer">unSetupPlayer</a></span></li>
245245

@@ -422,7 +422,7 @@ <h3 class="subsubtitle task-title">VMediaPlayer Setup&amp;unSetup Methods</h3>
422422
<ul class="task-list">
423423
<li>
424424
<span class="tooltip">
425-
<code><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">&ndash;&nbsp;setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</a></code>
425+
<code><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">&ndash;&nbsp;setupPlayerWithCarrierView:withDelegate:</a></code>
426426
</span>
427427

428428

@@ -1097,8 +1097,8 @@ <h4 class="method-subtitle">Declared In</h4>
10971097
<h2 class="subtitle subtitle-methods">Instance Methods</h2>
10981098

10991099
<div class="section-method">
1100-
<a name="//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:" title="setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:"></a>
1101-
<h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</h3>
1100+
<a name="//api/name/setupPlayerWithCarrierView:withDelegate:" title="setupPlayerWithCarrierView:withDelegate:"></a>
1101+
<h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:</h3>
11021102

11031103

11041104

@@ -1108,7 +1108,7 @@ <h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:wit
11081108

11091109

11101110

1111-
<div class="method-subsection method-declaration"><code>- (BOOL)setupPlayerWithCarrierView:(UIView *)<em>carrier</em> withDelegate:(id&lt;VMediaPlayerDelegate&gt;)<em>dlg</em> withAppKey:(NSString *)<em>akey</em> withSecretKey:(NSString *)<em>skey</em></code></div>
1111+
<div class="method-subsection method-declaration"><code>- (BOOL)setupPlayerWithCarrierView:(UIView *)<em>carrier</em> withDelegate:(id&lt;VMediaPlayerDelegate&gt;)<em>dlg</em></code></div>
11121112

11131113

11141114

@@ -1120,16 +1120,6 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
11201120
<dd><p>The view of video picture will rendering to.</p></dd>
11211121
</dl>
11221122

1123-
<dl class="argument-def parameter-def">
1124-
<dt><em>akey</em></dt>
1125-
<dd><p>The App-Key.</p></dd>
1126-
</dl>
1127-
1128-
<dl class="argument-def parameter-def">
1129-
<dt><em>skey</em></dt>
1130-
<dd><p>The Secret-Key.</p></dd>
1131-
</dl>
1132-
11331123
<dl class="argument-def parameter-def">
11341124
<dt><em>delegate</em></dt>
11351125
<dd><p>The protocol to setup.</p></dd>
@@ -1202,6 +1192,15 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
12021192

12031193

12041194

1195+
<div class="method-subsection see-also-section">
1196+
<h4 class="method-subtitle">See Also</h4>
1197+
<ul>
1198+
1199+
<li><code><p><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">- setupPlayerWithCarrierView:withDelegate:</a></p></code></li>
1200+
1201+
</ul>
1202+
</div>
1203+
12051204

12061205

12071206
<div class="method-subsection declared-in-section">

Vitamio-online/include/Vitamio/VMediaPlayer.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,16 @@
3939
*
4040
* @param carrier The view of video picture will rendering to.
4141
* @param delegate The protocol to setup.
42-
* @param akey The App-Key.
43-
* @param skey The Secret-Key.
4442
* @return Returns YES or NO if setup fails.
4543
* @see unSetupPlayer
4644
*/
4745
- (BOOL)setupPlayerWithCarrierView:(UIView *)carrier
48-
withDelegate:(id<VMediaPlayerDelegate>)dlg
49-
withAppKey:(NSString *)akey
50-
withSecretKey:(NSString *)skey;
46+
withDelegate:(id<VMediaPlayerDelegate>)dlg;
5147

5248
/** Unsetup the media player.
5349
*
5450
* @return Returns YES or NO if the media player have not ever setup yet.
55-
* @see setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey
51+
* @see setupPlayerWithCarrierView:withDelegate:
5652
*/
5753
- (BOOL)unSetupPlayer;
5854

Vitamio-online/libVitamio.a

-1.98 KB
Binary file not shown.

Vitamio/include/Vitamio/VMediaPlayer.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,16 @@
3939
*
4040
* @param carrier The view of video picture will rendering to.
4141
* @param delegate The protocol to setup.
42-
* @param akey The App-Key.
43-
* @param skey The Secret-Key.
4442
* @return Returns YES or NO if setup fails.
4543
* @see unSetupPlayer
4644
*/
4745
- (BOOL)setupPlayerWithCarrierView:(UIView *)carrier
48-
withDelegate:(id<VMediaPlayerDelegate>)dlg
49-
withAppKey:(NSString *)akey
50-
withSecretKey:(NSString *)skey;
46+
withDelegate:(id<VMediaPlayerDelegate>)dlg;
5147

5248
/** Unsetup the media player.
5349
*
5450
* @return Returns YES or NO if the media player have not ever setup yet.
55-
* @see setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey
51+
* @see setupPlayerWithCarrierView:withDelegate:
5652
*/
5753
- (BOOL)unSetupPlayer;
5854

0 commit comments

Comments
 (0)