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 2014/01/08 00:15:53 UTC
[1/3] git commit: fixed cordova cli add capture plugin not work wp
Updated Branches:
refs/heads/master 101569451 -> e7f4dcda2
fixed cordova cli add capture plugin not work wp
1. updated feature name in plugin.xml;
2. updated navigate VideoRecorder.xaml & AudioRecorder.xaml Uri;
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/0cc5aee0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/0cc5aee0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/0cc5aee0
Branch: refs/heads/master
Commit: 0cc5aee09822179b1dcda3a9a84152377deaa785
Parents: 0774b94
Author: Yangtb <ya...@polyvi.com>
Authored: Wed Sep 11 17:32:49 2013 +0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Jan 7 15:14:03 2014 -0800
----------------------------------------------------------------------
src/wp/UI/AudioCaptureTask.cs | 2 +-
src/wp/UI/VideoCaptureTask.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/0cc5aee0/src/wp/UI/AudioCaptureTask.cs
----------------------------------------------------------------------
diff --git a/src/wp/UI/AudioCaptureTask.cs b/src/wp/UI/AudioCaptureTask.cs
index 9f43d23..91d5c5b 100644
--- a/src/wp/UI/AudioCaptureTask.cs
+++ b/src/wp/UI/AudioCaptureTask.cs
@@ -74,7 +74,7 @@ namespace WPCordovaClassLib.Cordova.UI
root.Navigated += new System.Windows.Navigation.NavigatedEventHandler(NavigationService_Navigated);
- string baseUrl = WPCordovaClassLib.Cordova.Commands.BaseCommand.GetBaseURL();
+ string baseUrl = "/";
// dummy parameter is used to always open a fresh version
root.Navigate(new System.Uri(baseUrl + "CordovaLib/UI/AudioRecorder.xaml?dummy=" + Guid.NewGuid().ToString(), UriKind.Relative));
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/0cc5aee0/src/wp/UI/VideoCaptureTask.cs
----------------------------------------------------------------------
diff --git a/src/wp/UI/VideoCaptureTask.cs b/src/wp/UI/VideoCaptureTask.cs
index def2a88..e3c90cf 100644
--- a/src/wp/UI/VideoCaptureTask.cs
+++ b/src/wp/UI/VideoCaptureTask.cs
@@ -74,7 +74,7 @@ namespace WPCordovaClassLib.Cordova.UI
root.Navigated += new System.Windows.Navigation.NavigatedEventHandler(NavigationService_Navigated);
- string baseUrl = WPCordovaClassLib.Cordova.Commands.BaseCommand.GetBaseURL();
+ string baseUrl = "/";
// dummy parameter is used to always open a fresh version
root.Navigate(new System.Uri(baseUrl + "CordovaLib/UI/VideoRecorder.xaml?dummy=" + Guid.NewGuid().ToString(), UriKind.Relative));
});
[2/3] git commit: fixed cordova cli add capture plugin not work wp
Posted by pu...@apache.org.
fixed cordova cli add capture plugin not work wp
1. updated feature name in plugin.xml;
2. updated navigate VideoRecorder.xaml & AudioRecorder.xaml Uri;
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/ce08a69b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/ce08a69b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/ce08a69b
Branch: refs/heads/master
Commit: ce08a69ba98771de1a6295ab2ae4ddc126701d54
Parents: 0cc5aee
Author: Yangtb <ya...@polyvi.com>
Authored: Wed Sep 11 14:25:18 2013 +0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Jan 7 15:14:22 2014 -0800
----------------------------------------------------------------------
plugin.xml | 8 ++++----
src/wp/UI/AudioCaptureTask.cs | 2 +-
src/wp/UI/VideoCaptureTask.cs | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/ce08a69b/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 44a35e7..e1160cf 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -83,8 +83,8 @@ xmlns:android="http://schemas.android.com/apk/res/android"
<!-- wp7 -->
<platform name="wp7">
<config-file target="config.xml" parent="/*">
- <feature name="Notification">
- <param name="wp-package" value="Notification"/>
+ <feature name="Capture">
+ <param name="wp-package" value="Capture"/>
</feature>
</config-file>
@@ -106,8 +106,8 @@ xmlns:android="http://schemas.android.com/apk/res/android"
<!-- wp8 -->
<platform name="wp8">
<config-file target="config.xml" parent="/*">
- <feature name="Notification">
- <param name="wp-package" value="Notification"/>
+ <feature name="Capture">
+ <param name="wp-package" value="Capture"/>
</feature>
</config-file>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/ce08a69b/src/wp/UI/AudioCaptureTask.cs
----------------------------------------------------------------------
diff --git a/src/wp/UI/AudioCaptureTask.cs b/src/wp/UI/AudioCaptureTask.cs
index 91d5c5b..c7ed2d9 100644
--- a/src/wp/UI/AudioCaptureTask.cs
+++ b/src/wp/UI/AudioCaptureTask.cs
@@ -76,7 +76,7 @@ namespace WPCordovaClassLib.Cordova.UI
string baseUrl = "/";
// dummy parameter is used to always open a fresh version
- root.Navigate(new System.Uri(baseUrl + "CordovaLib/UI/AudioRecorder.xaml?dummy=" + Guid.NewGuid().ToString(), UriKind.Relative));
+ root.Navigate(new System.Uri(baseUrl + "Plugins/org.apache.cordova.core.media-capture/AudioRecorder.xaml?dummy=" + Guid.NewGuid().ToString(), UriKind.Relative));
});
}
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/ce08a69b/src/wp/UI/VideoCaptureTask.cs
----------------------------------------------------------------------
diff --git a/src/wp/UI/VideoCaptureTask.cs b/src/wp/UI/VideoCaptureTask.cs
index e3c90cf..8770189 100644
--- a/src/wp/UI/VideoCaptureTask.cs
+++ b/src/wp/UI/VideoCaptureTask.cs
@@ -76,7 +76,7 @@ namespace WPCordovaClassLib.Cordova.UI
string baseUrl = "/";
// dummy parameter is used to always open a fresh version
- root.Navigate(new System.Uri(baseUrl + "CordovaLib/UI/VideoRecorder.xaml?dummy=" + Guid.NewGuid().ToString(), UriKind.Relative));
+ root.Navigate(new System.Uri(baseUrl + "Plugins/org.apache.cordova.core.media-capture/VideoRecorder.xaml?dummy=" + Guid.NewGuid().ToString(), UriKind.Relative));
});
}
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture
Posted by pu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/e7f4dcda
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/e7f4dcda
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/e7f4dcda
Branch: refs/heads/master
Commit: e7f4dcda2c5a960a69e09305c8ae793b8c24bb18
Parents: ce08a69 1015694
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Jan 7 15:15:23 2014 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Jan 7 15:15:23 2014 -0800
----------------------------------------------------------------------
CHANGELOG.md | 23 --
README.md | 25 +-
RELEASENOTES.md | 56 +++
doc/index.md | 597 +++++++++++++++++++++++++++
docs/MediaError/mediaError.md | 45 --
docs/Parameters/mediaError.md | 33 --
docs/capture/CaptureCB.md | 47 ---
docs/capture/CaptureError.md | 37 --
docs/capture/CaptureErrorCB.md | 44 --
docs/capture/ConfigurationData.md | 63 ---
docs/capture/MediaFile.getFormatData.md | 64 ---
docs/capture/MediaFile.md | 37 --
docs/capture/MediaFileData.md | 65 ---
docs/capture/capture.md | 133 ------
docs/capture/captureAudio.md | 152 -------
docs/capture/captureAudioOptions.md | 52 ---
docs/capture/captureImage.md | 168 --------
docs/capture/captureImageOptions.md | 41 --
docs/capture/captureVideo.md | 171 --------
docs/capture/captureVideoOptions.md | 47 ---
docs/media.getCurrentPosition.md | 176 --------
docs/media.getDuration.md | 167 --------
docs/media.md | 145 -------
docs/media.pause.md | 167 --------
docs/media.play.md | 200 ---------
docs/media.release.md | 159 -------
docs/media.seekTo.md | 161 --------
docs/media.setVolume.md | 178 --------
docs/media.startRecord.md | 155 -------
docs/media.stop.md | 172 --------
docs/media.stopRecord.md | 142 -------
plugin.xml | 46 ++-
src/android/Capture.java | 211 ++++++----
src/android/FileHelper.java | 60 +++
src/ios/CDVCapture.m | 116 +++++-
src/ubuntu/back.png | Bin 0 -> 12428 bytes
src/ubuntu/capture.cpp | 167 ++++++++
src/ubuntu/capture.h | 84 ++++
src/ubuntu/microphone.png | Bin 0 -> 10415 bytes
src/ubuntu/record_off.png | Bin 0 -> 10087 bytes
src/ubuntu/record_on.png | Bin 0 -> 4902 bytes
src/ubuntu/shoot.png | Bin 0 -> 14430 bytes
src/ubuntu/toolbar-left.png | Bin 0 -> 1212 bytes
src/ubuntu/toolbar-middle.png | Bin 0 -> 4416 bytes
src/ubuntu/toolbar-right.png | Bin 0 -> 1161 bytes
src/windows8/CaptureProxy.js | 14 +-
src/windows8/MediaFile.js | 4 +-
test/capture/index.html | 150 +++++++
test/cordova-incl.js | 3 +-
test/index.html | 1 +
www/MediaFile.js | 2 +-
51 files changed, 1415 insertions(+), 3165 deletions(-)
----------------------------------------------------------------------