Version 4.2.0

yixia · Dec 31, 2013 · afe7eca · afe7eca
1 parent e810225
commit afe7eca
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 47 deletions.
diff --git a/Demo/Vitamio-Demo/PlayerController.m b/Demo/Vitamio-Demo/PlayerController.m
@@ -65,9 +65,7 @@ - (void)viewDidLoad
 
 	if (!mMPayer) {
 		mMPayer = [VMediaPlayer sharedInstance];
-		NSString *akey = @"wn9iKq0p9JSMfWz3G78ZvtlN";
-		NSString *skey = @"348b3e1ed183154034ce49decc8e1d69";
-		[mMPayer setupPlayerWithCarrierView:self.carrier withDelegate:self withAppKey:akey withSecretKey:skey];
+		[mMPayer setupPlayerWithCarrierView:self.carrier withDelegate:self];
 		[self setupObservers];
 	}
 }

diff --git a/Doc/com.yixia.Vitamio.docset/Contents/Resources/Documents/Classes/VMediaPlayer.html b/Doc/com.yixia.Vitamio.docset/Contents/Resources/Documents/Classes/VMediaPlayer.html
@@ -59,7 +59,7 @@ <h1 class="hideInXcode">VMediaPlayer Class Reference</h1>
 
 	<option value="instance_methods">Instance Methods</option>
 
-	<option value="//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">&nbsp;&nbsp;&nbsp;&nbsp;- setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</option>
+	<option value="//api/name/setupPlayerWithCarrierView:withDelegate:">&nbsp;&nbsp;&nbsp;&nbsp;- setupPlayerWithCarrierView:withDelegate:</option>
 
 	<option value="//api/name/unSetupPlayer">&nbsp;&nbsp;&nbsp;&nbsp;- unSetupPlayer</option>
 
@@ -239,7 +239,7 @@ <h1 class="hideInXcode">VMediaPlayer Class Reference</h1>
 
 <li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
 
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</a></span></li>
+	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">setupPlayerWithCarrierView:withDelegate:</a></span></li>
 
 	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/unSetupPlayer">unSetupPlayer</a></span></li>
 
@@ -422,7 +422,7 @@ <h3 class="subsubtitle task-title">VMediaPlayer Setup&amp;unSetup Methods</h3>
 						<ul class="task-list">
 							<li>
 	<span class="tooltip">
-		<code><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">&ndash;&nbsp;setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</a></code>
+		<code><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">&ndash;&nbsp;setupPlayerWithCarrierView:withDelegate:</a></code>
 	</span>
 
 
@@ -1097,8 +1097,8 @@ <h4 class="method-subtitle">Declared In</h4>
 						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
 
 						<div class="section-method">
-	<a name="//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:" title="setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:"></a>
-	<h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</h3>
+	<a name="//api/name/setupPlayerWithCarrierView:withDelegate:" title="setupPlayerWithCarrierView:withDelegate:"></a>
+	<h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:</h3>
 
 
 
@@ -1108,7 +1108,7 @@ <h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:wit
 
 
 
-	<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>
+	<div class="method-subsection method-declaration"><code>- (BOOL)setupPlayerWithCarrierView:(UIView *)<em>carrier</em> withDelegate:(id&lt;VMediaPlayerDelegate&gt;)<em>dlg</em></code></div>
 
 
 
@@ -1120,16 +1120,6 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			<dd><p>The view of video picture will rendering to.</p></dd>
 		</dl>
 
-		<dl class="argument-def parameter-def">
-			<dt><em>akey</em></dt>
-			<dd><p>The App-Key.</p></dd>
-		</dl>
-
-		<dl class="argument-def parameter-def">
-			<dt><em>skey</em></dt>
-			<dd><p>The Secret-Key.</p></dd>
-		</dl>
-
 		<dl class="argument-def parameter-def">
 			<dt><em>delegate</em></dt>
 			<dd><p>The protocol to setup.</p></dd>
@@ -1202,6 +1192,15 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 
 
 
+	<div class="method-subsection see-also-section">
+		<h4 class="method-subtitle">See Also</h4>
+		<ul>
+
+			<li><code><p><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">- setupPlayerWithCarrierView:withDelegate:</a></p></code></li>
+
+		</ul>
+	</div>
+
 
 
 	<div class="method-subsection declared-in-section">

diff --git a/Doc/com.yixia.Vitamio.docset/Contents/Resources/docSet.dsidx b/Doc/com.yixia.Vitamio.docset/Contents/Resources/docSet.dsidx
diff --git a/Doc/com.yixia.Vitamio.docset/Contents/Resources/docSet.skidx b/Doc/com.yixia.Vitamio.docset/Contents/Resources/docSet.skidx
diff --git a/Doc/com.yixia.Vitamio.docset/Contents/Resources/docSet.toc b/Doc/com.yixia.Vitamio.docset/Contents/Resources/docSet.toc
diff --git a/Doc/com.yixia.Vitamio.docset/Contents/Resources/docSet.tokencache b/Doc/com.yixia.Vitamio.docset/Contents/Resources/docSet.tokencache
diff --git a/Doc/html/Classes/VMediaPlayer.html b/Doc/html/Classes/VMediaPlayer.html
@@ -59,7 +59,7 @@ <h1 class="hideInXcode">VMediaPlayer Class Reference</h1>
 
 	<option value="instance_methods">Instance Methods</option>
 
-	<option value="//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">&nbsp;&nbsp;&nbsp;&nbsp;- setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</option>
+	<option value="//api/name/setupPlayerWithCarrierView:withDelegate:">&nbsp;&nbsp;&nbsp;&nbsp;- setupPlayerWithCarrierView:withDelegate:</option>
 
 	<option value="//api/name/unSetupPlayer">&nbsp;&nbsp;&nbsp;&nbsp;- unSetupPlayer</option>
 
@@ -239,7 +239,7 @@ <h1 class="hideInXcode">VMediaPlayer Class Reference</h1>
 
 <li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
 
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</a></span></li>
+	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">setupPlayerWithCarrierView:withDelegate:</a></span></li>
 
 	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/unSetupPlayer">unSetupPlayer</a></span></li>
 
@@ -422,7 +422,7 @@ <h3 class="subsubtitle task-title">VMediaPlayer Setup&amp;unSetup Methods</h3>
 						<ul class="task-list">
 							<li>
 	<span class="tooltip">
-		<code><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:">&ndash;&nbsp;setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</a></code>
+		<code><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">&ndash;&nbsp;setupPlayerWithCarrierView:withDelegate:</a></code>
 	</span>
 
 
@@ -1097,8 +1097,8 @@ <h4 class="method-subtitle">Declared In</h4>
 						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
 
 						<div class="section-method">
-	<a name="//api/name/setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:" title="setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:"></a>
-	<h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey:</h3>
+	<a name="//api/name/setupPlayerWithCarrierView:withDelegate:" title="setupPlayerWithCarrierView:withDelegate:"></a>
+	<h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:</h3>
 
 
 
@@ -1108,7 +1108,7 @@ <h3 class="subsubtitle method-title">setupPlayerWithCarrierView:withDelegate:wit
 
 
 
-	<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>
+	<div class="method-subsection method-declaration"><code>- (BOOL)setupPlayerWithCarrierView:(UIView *)<em>carrier</em> withDelegate:(id&lt;VMediaPlayerDelegate&gt;)<em>dlg</em></code></div>
 
 
 
@@ -1120,16 +1120,6 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			<dd><p>The view of video picture will rendering to.</p></dd>
 		</dl>
 
-		<dl class="argument-def parameter-def">
-			<dt><em>akey</em></dt>
-			<dd><p>The App-Key.</p></dd>
-		</dl>
-
-		<dl class="argument-def parameter-def">
-			<dt><em>skey</em></dt>
-			<dd><p>The Secret-Key.</p></dd>
-		</dl>
-
 		<dl class="argument-def parameter-def">
 			<dt><em>delegate</em></dt>
 			<dd><p>The protocol to setup.</p></dd>
@@ -1202,6 +1192,15 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 
 
 
+	<div class="method-subsection see-also-section">
+		<h4 class="method-subtitle">See Also</h4>
+		<ul>
+
+			<li><code><p><a href="#//api/name/setupPlayerWithCarrierView:withDelegate:">- setupPlayerWithCarrierView:withDelegate:</a></p></code></li>
+
+		</ul>
+	</div>
+
 
 
 	<div class="method-subsection declared-in-section">

diff --git a/Vitamio-online/include/Vitamio/VMediaPlayer.h b/Vitamio-online/include/Vitamio/VMediaPlayer.h
@@ -39,20 +39,16 @@
  *
  * @param carrier The view of video picture will rendering to.
  * @param delegate The protocol to setup.
- * @param akey The App-Key.
- * @param skey The Secret-Key.
  * @return Returns YES or NO if setup fails.
  * @see unSetupPlayer
  */
 - (BOOL)setupPlayerWithCarrierView:(UIView *)carrier
-					  withDelegate:(id<VMediaPlayerDelegate>)dlg
-						withAppKey:(NSString *)akey
-					 withSecretKey:(NSString *)skey;
+					  withDelegate:(id<VMediaPlayerDelegate>)dlg;
 
 /** Unsetup the media player.
  *
  * @return Returns YES or NO if the media player have not ever setup yet.
- * @see setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey
+ * @see setupPlayerWithCarrierView:withDelegate:
  */
 - (BOOL)unSetupPlayer;
 

diff --git a/Vitamio-online/libVitamio.a b/Vitamio-online/libVitamio.a
diff --git a/Vitamio/include/Vitamio/VMediaPlayer.h b/Vitamio/include/Vitamio/VMediaPlayer.h
@@ -39,20 +39,16 @@
  *
  * @param carrier The view of video picture will rendering to.
  * @param delegate The protocol to setup.
- * @param akey The App-Key.
- * @param skey The Secret-Key.
  * @return Returns YES or NO if setup fails.
  * @see unSetupPlayer
  */
 - (BOOL)setupPlayerWithCarrierView:(UIView *)carrier
-					  withDelegate:(id<VMediaPlayerDelegate>)dlg
-						withAppKey:(NSString *)akey
-					 withSecretKey:(NSString *)skey;
+					  withDelegate:(id<VMediaPlayerDelegate>)dlg;
 
 /** Unsetup the media player.
  *
  * @return Returns YES or NO if the media player have not ever setup yet.
- * @see setupPlayerWithCarrierView:withDelegate:withAppKey:withSecretKey
+ * @see setupPlayerWithCarrierView:withDelegate:
  */
 - (BOOL)unSetupPlayer;
 

diff --git a/Vitamio/libVitamio.a b/Vitamio/libVitamio.a