-
Notifications
You must be signed in to change notification settings - Fork 76
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ivona #15
Open
d4rkstar
wants to merge
4
commits into
marcelog:master
Choose a base branch
from
d4rkstar:ivona
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+202
−37
Open
Ivona #15
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
b6a2aa6
Merge pull request #1 from d4rkstar/validatefix
d4rkstar bdb1897
fixed some comments that prevented autocomplete on Node methods
b41433f
Merge pull request #2 from d4rkstar/fixcomments
d4rkstar 9e89d17
Implemented sayIVONA command and integrated IVONA TTS into Node
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -460,6 +460,20 @@ public function sayPhonetic($what, $escapeDigits = '') | |
))); | ||
} | ||
|
||
/** | ||
* (non-PHPdoc) | ||
* @see PAGI\Client.IClient::sayIVONA() | ||
*/ | ||
public function sayIVONA($what) | ||
{ | ||
$result = new IvonaResult($this->exec('IVONA', array($what))); | ||
$dtmf = $result->getResult(); | ||
if ($dtmf !== "") { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. let's use empty() here |
||
$result->setData(chr($dtmf)); | ||
} | ||
return $result; | ||
} | ||
|
||
private function _playAndRead($cmd) | ||
{ | ||
return new PlayResult(new DigitReadResult($this->send($cmd))); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,126 @@ | ||
<?php | ||
/** | ||
* This decorated result adds the functionality to check for user input. We | ||
* need a distinction between a single digit read (this class) and a data read | ||
* (DataReadResult) because asterisk sends the ascii number for the character | ||
* read (the first case) and the literal string in the latter. | ||
* | ||
* PHP Version 5 | ||
* | ||
* @category Pagi | ||
* @package Client | ||
* @subpackage Result | ||
* @author Marcelo Gornstein <[email protected]> | ||
* @license http://marcelog.github.com/PAGI/ Apache License 2.0 | ||
* @version SVN: $Id$ | ||
* @link http://marcelog.github.com/PAGI/ | ||
* | ||
* Copyright 2011 Marcelo Gornstein <[email protected]> | ||
* | ||
* Licensed 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. | ||
* | ||
*/ | ||
|
||
namespace PAGI\Client\Result; | ||
|
||
/** | ||
* This result adds the functionality to check for IVONA TTS result. | ||
* | ||
* PHP Version 5 | ||
* | ||
* @category Pagi | ||
* @package Client | ||
* @subpackage Result | ||
* @author Marcelo Gornstein <[email protected]> | ||
* @author Bruno Salzano <[email protected]> | ||
* @license http://marcelog.github.com/PAGI/ Apache License 2.0 | ||
* @link http://marcelog.github.com/PAGI/ | ||
*/ | ||
class IvonaResult extends ExecResult | ||
{ | ||
/** | ||
* Local data that will store result. | ||
* @var string | ||
*/ | ||
protected $data = null; | ||
|
||
/** | ||
* (non-PHPdoc) | ||
* @see PAGI\Client\Result.IResult::hasData() | ||
*/ | ||
public function hasData() { | ||
return $this->data != null; | ||
} | ||
|
||
/** | ||
* Sets data with digit grabbed from result. | ||
* | ||
* @param string $value Value to set. | ||
* | ||
* @return void | ||
*/ | ||
public function setData($data) { | ||
$this->data = $data; | ||
} | ||
|
||
/** | ||
* Returns data stored in this result. | ||
* | ||
* @return string | ||
*/ | ||
public function getData() { | ||
return $this->data; | ||
} | ||
|
||
/** | ||
* (non-PHPdoc) | ||
* @see PAGI\Client\Result.IReadResult::isTimeout() | ||
*/ | ||
public function isTimeout() { | ||
return $this->data==null; | ||
} | ||
|
||
/** | ||
* (non-PHPdoc) | ||
* @see PAGI\Client\Result.IReadResult::getDigits() | ||
*/ | ||
public function getDigits() | ||
{ | ||
return $this->data; | ||
} | ||
|
||
/** | ||
* (non-PHPdoc) | ||
* @see PAGI\Client\Result.IReadResult::getDigitsCount() | ||
*/ | ||
public function getDigitsCount() | ||
{ | ||
return strlen($this->data); | ||
} | ||
|
||
|
||
/** | ||
* Constructor. | ||
* | ||
* @param IResult $result Result to decorate. | ||
* | ||
* @return void | ||
*/ | ||
public function __construct(IResult $result) | ||
{ | ||
parent::__construct($result); | ||
|
||
|
||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's call this sayIvona