Commit 294d2e33 authored by ldeluca's avatar ldeluca
Browse files

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-media

parents fb146914 6d6ac196

CONTRIBUTING.md

0 → 100644
+16 −0
Changes for CONTRIBUTING.md: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line 
# Contributing to Apache Cordova



Anyone can contribute to Cordova. And we need your contributions.



There are multiple ways to contribute: report bugs, improve the docs, and

contribute code.



For instructions on this, start with the 

[contribution overview](http://cordova.apache.org/#contribute).



The details are explained there, but the important items are:

 - Sign and submit an Apache ICLA (Contributor License Agreement).

 - Have a Jira issue open that corresponds to your contribution.

 - Run the tests so your patch doesn't break existing functionality.



We look forward to your contributions!

RELEASENOTES.md

+8 −0
Changes for RELEASENOTES.md: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -61,3 +61,11 @@ 
### 0.2.9 (Feb 26, 2014)

* CB-6051 Update media plugin to work with new cdvfile:// urls

* CB-5748 Make sure that Media.onStatus is called when recording is started.



### 0.2.10 (Apr 17, 2014)

* CB-6422: [windows8] use cordova/exec/proxy

* CB-6212: [iOS] fix warnings compiled under arm64 64-bit

* CB-6225: Specify plugin dependency on File plugin 1.0.1

* CB-6460: Update license headers

* CB-6465: Add license headers to Tizen code

* Add NOTICE file

plugin.xml

+21 −1
Changes for plugin.xml: 21 added lines, 1 removed line.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

  Licensed to the Apache Software Foundation (ASF) under one

  or more contributor license agreements.  See the NOTICE file

  distributed with this work for additional information

  regarding copyright ownership.  The ASF licenses this file

  to you under the Apache License, Version 2.0 (the

  "License"); you may not use this file except in compliance

  with the License.  You may obtain a copy of the License at



    http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing,

  software distributed under the License is distributed on an

  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

  KIND, either express or implied.  See the License for the

  specific language governing permissions and limitations

  under the License.

-->



<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"

xmlns:android="http://schemas.android.com/apk/res/android"

id="org.apache.cordova.media"

    version="0.2.9">

    version="0.2.11-dev">



    <name>Media</name>

    <description>Cordova Media Plugin</description>
@@ -12,6 +30,8 @@ id="org.apache.cordova.media" 
    <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-media.git</repo>

    <issue>https://issues.apache.org/jira/browse/CB/component/12320647</issue>

    

    <dependency id="org.apache.cordova.file" version="1.0.1" />



    <js-module src="www/MediaError.js" name="MediaError">

        <clobbers target="window.MediaError" />

    </js-module>

src/ios/CDVSound.m

+1 −1
Changes for src/ios/CDVSound.m: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ 
{

    NSMutableDictionary* errorDict = [NSMutableDictionary dictionaryWithCapacity:2];



    [errorDict setObject:[NSNumber numberWithUnsignedInt:code] forKey:@"code"];

    [errorDict setObject:[NSNumber numberWithUnsignedInteger:code] forKey:@"code"];

    [errorDict setObject:message ? message:@"" forKey:@"message"];

    return [errorDict JSONString];

}

src/tizen/MediaProxy.js

+21 −0
Changes for src/tizen/MediaProxy.js: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line 
/*

 *

 * Licensed to the Apache Software Foundation (ASF) under one

 * or more contributor license agreements.  See the NOTICE file

 * distributed with this work for additional information

 * regarding copyright ownership.  The ASF licenses this file

 * to you under the Apache License, Version 2.0 (the

 * "License"); you may not use this file except in compliance

 * with the License.  You may obtain a copy of the License at

 *

 *   http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing,

 * software distributed under the License is distributed on an

 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

 * KIND, either express or implied.  See the License for the

 * specific language governing permissions and limitations

 * under the License.

 *

*/



var cordova = require('cordova'),

    Media = require('org.apache.cordova.media.Media');