ストリーミング再生時のDMCセッション維持時間を動画再生時間と等しくするよう変更

SSW-SCIENTIFIC · Jun 11, 2017 · d14b54d · d14b54d
1 parent a548c5e
commit d14b54d
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 18 deletions.
diff --git a/history_utf8.txt b/history_utf8.txt
@@ -3,6 +3,9 @@ NNDD ニコニコ動画ダウンロード&再生ソフト　更新履歴
 MAP - MineApplicationProject.
 SSW-SCIENTIFIC - forked version (2.4.4～)
 -------------------------------------------
+***2017-06-12 v2.5.4
+・ストリーミング再生時にDMCセッションの維持時間を動画の再生時間と同じに変更
+
 ***2017-06-09 v2.5.3
 ・DMCサーバへのリクエストパラメータを動的に取得するように修正
 

diff --git a/libs/nicovideo4as.swc b/libs/nicovideo4as.swc
diff --git a/src/NNDD-app.xml b/src/NNDD-app.xml
@@ -23,10 +23,10 @@
 	<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
 	Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
 	An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
-	<versionNumber>2.5.3</versionNumber>
+	<versionNumber>2.5.4</versionNumber>
 
 	<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
-	<versionLabel>v2.5.3-Beta</versionLabel>
+	<versionLabel>v2.5.4-Beta</versionLabel>
 
 	<!-- Description, displayed in the AIR application installer. Optional. -->
 	<!-- <description></description> -->

diff --git a/src/org/mineap/nndd/NNDDDownloader.as b/src/org/mineap/nndd/NNDDDownloader.as
@@ -81,7 +81,7 @@ import mx.controls.Alert;
 		private var _videoStream:VideoStream;
 
         public var _dmcAccess: ApiDmcAccess;
-		private var _dmcInfoAnalyzer: DmcInfoAnalyzer;
+		public var _dmcInfoAnalyzer: DmcInfoAnalyzer;
 		public var _dmcResultAnalyzer: DmcResultAnalyzer;
 
         private var _otherNNDDInfoLoader:URLLoader;

diff --git a/src/org/mineap/nndd/player/PlayerController.as b/src/org/mineap/nndd/player/PlayerController.as
@@ -723,10 +723,8 @@ import mx.collections.ArrayCollection;
 
 					videoDisplay.addEventListener(LoadEvent.BYTES_LOADED_CHANGE, byteloadedChangedEventHandler);
 					videoDisplay.addEventListener(TimeEvent.CURRENT_TIME_CHANGE, osmfCurrentTimeChangeEventHandler);
-					videoDisplay.addEventListener(MediaPlayerStateChangeEvent.MEDIA_PLAYER_STATE_CHANGE, function (event: MediaPlayerStateChangeEvent): void {
-
-					});
 					videoDisplay.addEventListener(MouseEvent.CLICK, function(event:MouseEvent):void{
+                        event.currentTarget.setFocus();
 					});
 
 					videoPlayer.videoController.button_play.setStyle("icon", icon_Pause);
@@ -4176,17 +4174,19 @@ import mx.collections.ArrayCollection;
 						nnddDownloaderForStreaming._otherNNDDServerPort = nnddServerPortNum;
 						nnddDownloaderForStreaming.addEventListener(NNDDDownloader.DOWNLOAD_PROCESS_COMPLETE, function(event:Event):void{
 							var intervalId: int;
-							if ((event.target as NNDDDownloader).streamingUrl.match(new RegExp("http://[a-z0-9]+\.dmc\.nico")) != null) {
-								intervalId = setInterval(function () {
+							var nnddDownloader: NNDDDownloader = (event.target as NNDDDownloader);
+							if (nnddDownloader.streamingUrl.match(new RegExp("http://[a-z0-9]+\.dmc\.nico")) != null) {
+								intervalId = setInterval(function (): void {
 									trace("DmcBeating...");
-                                    (event.target as NNDDDownloader)._dmcAccess.beatDmcSession(
-											(event.target as NNDDDownloader)._dmcResultAnalyzer.sessionId,
-                                            (event.target as NNDDDownloader)._dmcResultAnalyzer.session
+                                    nnddDownloader._dmcAccess.beatDmcSession(
+                                            nnddDownloader._dmcResultAnalyzer.sessionId,
+                                            nnddDownloader._dmcResultAnalyzer.session
 									);
-								}, (event.target as NNDDDownloader)._dmcResultAnalyzer.session.session.keep_method.heartbeat.lifetime * 0.9);
-								setTimeout(function () {
+								}, nnddDownloader._dmcResultAnalyzer.session.session.keep_method.heartbeat.lifetime * 0.9);
+								setTimeout(function (): void {
+                                    trace("Clearing Interval...");
 									clearInterval(intervalId);
-								}, 1000 * 60 * 10);
+								}, nnddDownloader._dmcInfoAnalyzer.dmcInfo.video.length_seconds * 1000);
 							}
 							_playMovie((event.target as NNDDDownloader).streamingUrl, 
 								(event.target as NNDDDownloader).fmsToken, 

diff --git a/update_v2_native.xml b/update_v2_native.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <update xmlns="http://ns.riaspace.com/air/framework/update/description/1.1">
 <dmg>
-	<version>2.5.3</version>
-	<url>https://github.com/SSW-SCIENTIFIC/NNDD/releases/download/v2.5.3-Beta/NNDD_v2_5_3.dmg</url>
+	<version>2.5.4</version>
+	<url>https://github.com/SSW-SCIENTIFIC/NNDD/releases/download/v2.5.4-Beta/NNDD_v2_5_4.dmg</url>
 	<description><![CDATA[
+2017-06-12 v2.5.4
+・ストリーミング再生時にDMCセッションの維持時間を動画の再生時間と同じに変更
+
 2017-06-09 v2.5.3
 ・DMCサーバへのリクエストパラメータを動的に取得するように修正
 
@@ -52,9 +55,12 @@
 </dmg>
 
 <exe>
-	<version>2.5.3</version>
-	<url>https://github.com/SSW-SCIENTIFIC/NNDD/releases/download/v2.5.3-Beta/NNDD_v2_5_3.exe</url>
+	<version>2.5.4</version>
+	<url>https://github.com/SSW-SCIENTIFIC/NNDD/releases/download/v2.5.4-Beta/NNDD_v2_5_4.exe</url>
 	<description><![CDATA[
+2017-06-12 v2.5.4
+・ストリーミング再生時にDMCセッションの維持時間を動画の再生時間と同じに変更
+
 2017-06-09 v2.5.3
 ・DMCサーバへのリクエストパラメータを動的に取得するように修正