You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/12/02 01:35:47 UTC

[1/3] cordova-plugin-media git commit: Fixed example referencing non-existent variable

Repository: cordova-plugin-media
Updated Branches:
  refs/heads/master 7a401d966 -> 855a57d97


Fixed example referencing non-existent variable

Fixed example referencing non-existent variable media, fixed to use my_media variable.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/e543c121
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/e543c121
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/e543c121

Branch: refs/heads/master
Commit: e543c12184444f50f704e26a2c798f2de02b47ff
Parents: f21a281
Author: Glen Baker <ie...@gmail.com>
Authored: Fri Oct 23 00:14:40 2015 -0400
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Dec 1 16:23:50 2015 -0800

----------------------------------------------------------------------
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/e543c121/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index bbf5034..e5bb4a4 100644
--- a/README.md
+++ b/README.md
@@ -211,7 +211,7 @@ Pauses playing an audio file.
 
         // Pause after 10 seconds
         setTimeout(function () {
-            media.pause();
+            my_media.pause();
         }, 10000);
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[3/3] cordova-plugin-media git commit: Merged. Close #68. Close #74.

Posted by pu...@apache.org.
Merged. Close #68. Close #74.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/855a57d9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/855a57d9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/855a57d9

Branch: refs/heads/master
Commit: 855a57d97da66c990f3c62d1495158b9adf28dc1
Parents: e543c12
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Dec 1 16:35:35 2015 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Dec 1 16:35:35 2015 -0800

----------------------------------------------------------------------

----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[2/3] cordova-plugin-media git commit: CB-9452: Treat RTSP streams as remote URLs

Posted by pu...@apache.org.
CB-9452: Treat RTSP streams as remote URLs


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/f21a2815
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/f21a2815
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/f21a2815

Branch: refs/heads/master
Commit: f21a2815fba843cb7a8f414f35208424b892e232
Parents: 7a401d9
Author: John C. Bland II <jo...@gmail.com>
Authored: Tue Aug 4 23:55:27 2015 -0500
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Dec 1 16:23:50 2015 -0800

----------------------------------------------------------------------
 src/android/AudioPlayer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/f21a2815/src/android/AudioPlayer.java
----------------------------------------------------------------------
diff --git a/src/android/AudioPlayer.java b/src/android/AudioPlayer.java
index 2b9a84f..ede9330 100644
--- a/src/android/AudioPlayer.java
+++ b/src/android/AudioPlayer.java
@@ -303,7 +303,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
      * @return                  T=streaming, F=local
      */
     public boolean isStreaming(String file) {
-        if (file.contains("http://") || file.contains("https://")) {
+        if (file.contains("http://") || file.contains("https://") || file.contains("rtsp://")) {
             return true;
         }
         else {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org