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:55 UTC
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture
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(-)
----------------------------------------------------------------------