Menu
▾
▴
upstage-commits — svn commits get sent here. nothing else.
This list is closed, nobody may subscribe to it.
| 2007 |
Jan
|
Feb
|
Mar
(5) |
Apr
(5) |
May
(5) |
Jun
(34) |
Jul
|
Aug
(1) |
Sep
(1) |
Oct
|
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
|
Mar
(13) |
Apr
(32) |
May
(29) |
Jun
(17) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(3) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(24) |
Jun
(14) |
Jul
(9) |
Aug
(27) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(12) |
Sep
(78) |
Oct
(29) |
Nov
(27) |
Dec
(5) |
| 2013 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <aut...@us...> - 2013-04-16 22:32:09
|
Revision: 501
http://upstage.svn.sourceforge.net/upstage/?rev=501&view=rev
Author: aut-upstage
Date: 2013-04-16 22:31:59 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
17/04/2013 Craig Farrell. fix undefined bug for stageEdit.
Modified Paths:
--------------
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/html/stageedit.js
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2013-04-16 02:31:21 UTC (rev 500)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2013-04-16 22:31:59 UTC (rev 501)
@@ -147,6 +147,7 @@
<input type="hidden" name="debugTextMsg" id="debugTextMsg" class="debugMsg" value="%(debugMessages)s" />
<input type="hidden" name="colors" id="colorvals" value="%(colours)s"></input>
+ <input type="hidden" name="onstagelistMsg" id="onstagelistMsg" class="onstageMsg" value="%(onStageList)s"/>
</td>
</tr>
</table>
Modified: branches/2.4.2/html/stageedit.js
===================================================================
--- branches/2.4.2/html/stageedit.js 2013-04-16 02:31:21 UTC (rev 500)
+++ branches/2.4.2/html/stageedit.js 2013-04-16 22:31:59 UTC (rev 501)
@@ -54,6 +54,7 @@
resizePage();
//document.getElementById("debugp").style.position="absolute";
//document.getElementById("debugp").style.left="40%";
+ onStagelistToBeChecked(document.rupert.onstagelistMsg.value);//CF: on load it checks if the stage is on the stagelist.
}
else
{
@@ -66,7 +67,7 @@
//rm = document.getElementById("submit");
//rm.parentNode.removeChild(rm);
}
- onStagelistToBeChecked(document.rupert.onstagelistMsg.value);//CF: on load it checks if the stage is on the stagelist.
+
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2013-04-16 02:31:28
|
Revision: 500
http://upstage.svn.sourceforge.net/upstage/?rev=500&view=rev
Author: aut-upstage
Date: 2013-04-16 02:31:21 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Gavin - Changed footer date to current date in master_b.inc
Modified Paths:
--------------
branches/2.4.2/config/templates/master_b.inc
Modified: branches/2.4.2/config/templates/master_b.inc
===================================================================
--- branches/2.4.2/config/templates/master_b.inc 2013-04-16 02:28:24 UTC (rev 499)
+++ branches/2.4.2/config/templates/master_b.inc 2013-04-16 02:31:21 UTC (rev 500)
@@ -3,7 +3,7 @@
<div id="footer">
<!-- PR (09/11/2010) Thought this was a more usable place to put version info -->
<!-- Mohammed Al-Timimi (9/06/2011) - Moved because it was placed so very badly -->
- <p>UpStage V2.4.2 (12/10/2012)</p>
+ <p>UpStage V2.4.2 (16/04/2012)</p>
</div>
<div id="status" style="display:none;">
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2013-04-16 02:28:33
|
Revision: 499
http://upstage.svn.sourceforge.net/upstage/?rev=499&view=rev
Author: aut-upstage
Date: 2013-04-16 02:28:24 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Gavin - Created a conditional statement that displays the correct warning message when deleting media and actually deleting it in masterpage.js
- Removed a line of code in stageedit.xhtml that caused an error when accessing the stage edit page
Modified Paths:
--------------
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/html/masterpage.js
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2013-04-11 02:09:42 UTC (rev 498)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2013-04-16 02:28:24 UTC (rev 499)
@@ -17,6 +17,7 @@
- added the onstagelist checkbox, added text for it, added a heading for it as well.
- added an hidden input for the onstagelistMsg.
- added methods to the checkbox to call stageedit.js , so it can send message to server.
+Modified by Gavin Chan 16/04/2013 - Removed code that caused an error when accessing stage edit.
-->
<!include workshop_nav.inc>
<script type="text/javascript">
@@ -142,11 +143,10 @@
</td>
</tr>
<tr>
- <td><!--#(08/04/2013)Craig-->
- <input type="hidden" name="onstagelistMsg" id="onstagelistMsg" class="onstageMsg" value="%(onStageList)s"/>
+ <td><!--#(08/04/2013)Craig-->
+
<input type="hidden" name="debugTextMsg" id="debugTextMsg" class="debugMsg" value="%(debugMessages)s" />
<input type="hidden" name="colors" id="colorvals" value="%(colours)s"></input>
-
</td>
</tr>
</table>
@@ -157,7 +157,7 @@
<div id="submit">
<input type="hidden" name="action" value=""></input>
<table>
- <tr><!--#(08/04/2013)Craig-->
+ <tr>
<td style="width:0%;"><input type="button" onclick="seSaveOnly();" value="Save stage "></input></td>
<td style="width:0%;"><input type="button" onclick="saveStage(0);" value="Save and reload stage"></input></td>
<td colspan="3" style="width:50%;"><span id="warning">Warning: This will cause the stage to reload for everyone currently on it, and you will lose the chat log.</span></td>
@@ -177,4 +177,4 @@
<script type="text/javascript">stageEdit()</script>
</form>
</div>
-<!include master_b.inc>
+<!include master_b.inc>
\ No newline at end of file
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2013-04-11 02:09:42 UTC (rev 498)
+++ branches/2.4.2/html/masterpage.js 2013-04-16 02:28:24 UTC (rev 499)
@@ -33,6 +33,7 @@
Modified by Gavin (6/3/2013): Changed actions[type] to actions[5] to also delete the media on warn(type) function.
Modified by Craig Farrell (09/04/2013) - changed back to actions[type] so all the stageEdit buttens work again
- changed embedmessage method name so it is more understandable. called it seSaveOnly();
+ Modified by Gavin (16/4/2013): Made a conditional statement to display the correct media warning message and delete the media.
*/
//Instance type variables
@@ -837,10 +838,16 @@
if(doIt)
{
// Vibhu and Karena (09/08/2011): Deselects selected media.
- if(type == 5 || type == 7)
+ if(type == 5)
{
mediaSelected = false;
}
+ // Gavin (16/4/13): Displays warning message of deleting media and also deletes the media
+ if(type == 7)
+ {
+ mediaSelected = false;
+ type = 5;
+ }
// Gavin (6/3/13): Changed actions[type] to actions[5] to also delete the media
document.getElementById("status").innerHTML = 'Sending to server, please wait...';
document.getElementById("status").style.display = "inline";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2013-04-11 02:09:49
|
Revision: 498
http://upstage.svn.sourceforge.net/upstage/?rev=498&view=rev
Author: aut-upstage
Date: 2013-04-11 02:09:42 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
11/04/2013 Craig Farrell - added left rotate for avatars .
Modified Paths:
--------------
branches/2.4.3/client/src/model/ModelAvatars.as
branches/2.4.3/html/swf/classes.swf
branches/2.4.3/html/swf/client.swf
Modified: branches/2.4.3/client/src/model/ModelAvatars.as
===================================================================
--- branches/2.4.3/client/src/model/ModelAvatars.as 2013-04-09 00:34:21 UTC (rev 497)
+++ branches/2.4.3/client/src/model/ModelAvatars.as 2013-04-11 02:09:42 UTC (rev 498)
@@ -42,6 +42,10 @@
* Modified by: Vibhu Patel 31/08/2011 - Added field and function to store and set the background color of tool box items.
* Modified by: Daniel han 13/09/2012 - Added contextmenu for drawables.
* Modified by: Daniel Han 14/09/2012 - Added layer parameter under draw_line draw_move methods to calculate and send avatar relational position of drawing.
+ * Modified by: Craig Farrell 11/04/2013 - added new varible 'rotateClockWise' boolean.
+ * - added rotate left(ani-clockwise)
+ * - added new right click 'rotate avatar left' menu item.
+ *
*/
class model.ModelAvatars implements TransportInterface
{
@@ -65,6 +69,8 @@
public var avatars :Array;
private var userID :String;
public var moveFast :Boolean;
+ public var rotateClockWise :Boolean;//(11/04/2013) Craig
+
private var drawing :Boolean;
private var bAudioing :Boolean; // PQ: Added
@@ -85,6 +91,7 @@
this.avatar = null;
this.avatars = new Array();
this.moveFast = false;
+ this.rotateClockWise = true;//(11/04/2013) Craig
this.modelsounds = modelSounds;
this.avscrollBarColor = Client.UI_BACKGROUND;
};
@@ -238,11 +245,24 @@
//-------------------------------------------------------------------------
// Messages sent from Views to server
-
- function SET_ROTATE_AVATAR()
+ /**
+ * @Modified Craig Farrell (11/04/2013)
+ * @param clockwise:boolean
+ * @brief sends a message to server to rotate avatar.
+ */
+ function SET_ROTATE_AVATAR(clockwise:Boolean)//(11/04/2013) Craig
{
+ if (clockwise)//(11/04/2013) Craig
+ {
+ this.rotateClockWise = true;
+ }
+ else
+ {
+ this.rotateClockWise = false;
+ }
this.sender.ROTATE_AVATAR();
}
+
//-------------------------------------------------------------------------
// Messages from ActorButtons
@@ -591,13 +611,17 @@
modelAv.setLastStyle();
});
- var rotateAvatarMenuItem:ContextMenuItem = new ContextMenuItem("Rotate Avatar", function(){
- modelAv.SET_ROTATE_AVATAR();
+ var rotateAvatarRightMenuItem:ContextMenuItem = new ContextMenuItem("Rotate Avatar Right", function(){
+ modelAv.SET_ROTATE_AVATAR(true);//(11/04/2013) Craig
});
+
+ var rotateAvatarLeftMenuItem:ContextMenuItem = new ContextMenuItem("Rotate Avatar Left", function(){//(11/04/2013) Craig
+ modelAv.SET_ROTATE_AVATAR(false);
+ });
drawAvatarMenuItem.separatorBefore = true;
- myMenu.customItems.push(rotateAvatarMenuItem, moveupMenuItem, movedownMenuItem, movefastMenuItem, moveSlowMenuItem, drawAvatarMenuItem, clearDrawingMenuItem, renameMenuItem);
+ myMenu.customItems.push(rotateAvatarRightMenuItem,rotateAvatarLeftMenuItem, moveupMenuItem, movedownMenuItem, movefastMenuItem, moveSlowMenuItem, drawAvatarMenuItem, clearDrawingMenuItem, renameMenuItem);
av.menu = myMenu;
}
@@ -838,15 +862,24 @@
}
/**
- * @author Daniel Han (15/09/2012)
+ * @modified Craig Farrell (11/04/2013)
* @param avID
- * @brief Sets the rotation of avatar
+ * @brief Sets the rotation of avatar clockwise or ani clockwise
*/
function GET_ROTATE_AVATAR(avID:Number)
{
- avatars[avID].setRotation(90);
+ if (rotateClockWise)
+ {
+ avatars[avID].setRotation(90);
+ }
+ else
+ {
+ avatars[avID].setRotation(-90);//(11/04/2013) Craig
+ }
+
}
+
//-------------------------------------------------------------------------
// Utility functions
/**
Modified: branches/2.4.3/html/swf/classes.swf
===================================================================
(Binary files differ)
Modified: branches/2.4.3/html/swf/client.swf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2013-04-09 00:34:29
|
Revision: 497
http://upstage.svn.sourceforge.net/upstage/?rev=497&view=rev
Author: aut-upstage
Date: 2013-04-09 00:34:21 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
Craig Farrell 08/04/2013 - added redirect for deleting a stage.
Modified Paths:
--------------
branches/2.4.2/upstage/pages.py
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2013-04-08 23:39:33 UTC (rev 496)
+++ branches/2.4.2/upstage/pages.py 2013-04-09 00:34:21 UTC (rev 497)
@@ -79,6 +79,7 @@
Modified by: Craig Farrell 08/04/2013 - added new stagelist to home.xhtml page.
- added new stagelist to stages.xhtml page.
- added new text_onStageList.
+Modified by: Craig Farrell 09/04/2013 - added redirect when deleting the stage.
"""
#standard lib
@@ -841,7 +842,8 @@
elif action=='delete':
log.msg('In Deleted Function');
self.collection.stages.delete_stage(self.stagename, self.player);
- self.message+='Stage deleted. '
+ self.message+='Stage deleted. '
+ request.redirect("/admin")#(09/04/2013) Craig
elif action=='cancel':
###For now dont actually need to do anything.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2013-04-08 23:39:41
|
Revision: 496
http://upstage.svn.sourceforge.net/upstage/?rev=496&view=rev
Author: aut-upstage
Date: 2013-04-08 23:39:33 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
09/04/2013 Craig Farrell : - added new editable stage list feature in the edit stage page. and home&stages page
- fixed the bug with the edit stages buttons eg save,reset, cancel, delete .
- changed the name of a method so it is more understandable
Modified Paths:
--------------
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/html/masterpage.js
branches/2.4.2/html/stageedit.js
branches/2.4.2/upstage/pages.py
branches/2.4.2/upstage/stage.py
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2013-04-07 22:33:07 UTC (rev 495)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2013-04-08 23:39:33 UTC (rev 496)
@@ -13,6 +13,10 @@
Modified by Craig Farrell 02/10/2012 - changed butten layout so it is clearer to read and understand, fixed typos, changed text of headings and buttons.
Modified by Scott/Gavin/Craig 10/10/2012 - Added stage_saved python variable and successMsg div
Modified by Daniel 10/10/2012 - Removed divMessage and relocated successMsg div to come below the stageselection.
+Modified by Craig Farrell 08/04/2013 - changed all the butten warn() numbers to do what they are meant to. eg save,delete,reset,cancel
+ - added the onstagelist checkbox, added text for it, added a heading for it as well.
+ - added an hidden input for the onstagelistMsg.
+ - added methods to the checkbox to call stageedit.js , so it can send message to server.
-->
<!include workshop_nav.inc>
<script type="text/javascript">
@@ -60,6 +64,10 @@
<input type="checkbox" id="debug" name="debug" onclick="if (this.checked) {debugChecked()}else{debugUnChecked()}"/>
Print debug messages on the backdrop?
<br /> <br />
+ <h1>Stage list</h1> <!--#(08/04/2013)Craig-->
+ <input type="checkbox" id="onstagelist" name="onstagelist" onclick="if (this.checked) {onStageListChecked()}else{onStageListUnChecked()}"/>
+ Show this stage on stage list?
+ <br /> <br />
<h1>Background colour</h1>
<table style="padding:5px">
<tr>
@@ -134,9 +142,11 @@
</td>
</tr>
<tr>
- <td>
+ <td><!--#(08/04/2013)Craig-->
+ <input type="hidden" name="onstagelistMsg" id="onstagelistMsg" class="onstageMsg" value="%(onStageList)s"/>
<input type="hidden" name="debugTextMsg" id="debugTextMsg" class="debugMsg" value="%(debugMessages)s" />
<input type="hidden" name="colors" id="colorvals" value="%(colours)s"></input>
+
</td>
</tr>
</table>
@@ -147,8 +157,8 @@
<div id="submit">
<input type="hidden" name="action" value=""></input>
<table>
- <tr>
- <td style="width:0%;"><input type="button" onclick="embedsMessage();" value="Save stage "></input></td>
+ <tr><!--#(08/04/2013)Craig-->
+ <td style="width:0%;"><input type="button" onclick="seSaveOnly();" value="Save stage "></input></td>
<td style="width:0%;"><input type="button" onclick="saveStage(0);" value="Save and reload stage"></input></td>
<td colspan="3" style="width:50%;"><span id="warning">Warning: This will cause the stage to reload for everyone currently on it, and you will lose the chat log.</span></td>
</tr>
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2013-04-07 22:33:07 UTC (rev 495)
+++ branches/2.4.2/html/masterpage.js 2013-04-08 23:39:33 UTC (rev 496)
@@ -31,6 +31,8 @@
Modified by Scott (10/10/2012) -Added navHomeUser() method, so when the user logs out it redirects to /home instead of /admin/home
Modified by Scott/Craig/Gavin (10/10/2012) -Added embsMessage method to embbed the stage save success message into stageedit.xhtml
Modified by Gavin (6/3/2013): Changed actions[type] to actions[5] to also delete the media on warn(type) function.
+ Modified by Craig Farrell (09/04/2013) - changed back to actions[type] so all the stageEdit buttens work again
+ - changed embedmessage method name so it is more understandable. called it seSaveOnly();
*/
//Instance type variables
@@ -842,7 +844,7 @@
// Gavin (6/3/13): Changed actions[type] to actions[5] to also delete the media
document.getElementById("status").innerHTML = 'Sending to server, please wait...';
document.getElementById("status").style.display = "inline";
- document.rupert.action.value = actions[5];
+ document.rupert.action.value = actions[type];// 09/04/2013 Craig - changed back to type so all the stageEdit buttens work again
requestPage("POST", buildRequest(2),fillPage);
//18/05/2011 Navigates back to stage workshop page (Vibhu Patel)
/*
@@ -854,7 +856,7 @@
}
}
-function embedsMessage()
+function seSaveOnly() //09/04/2013 Craig - changed embedmessage method name so it is more understandable
{
doIt=confirm(warningMessages[6]);
if(doIt)
Modified: branches/2.4.2/html/stageedit.js
===================================================================
--- branches/2.4.2/html/stageedit.js 2013-04-07 22:33:07 UTC (rev 495)
+++ branches/2.4.2/html/stageedit.js 2013-04-08 23:39:33 UTC (rev 496)
@@ -19,10 +19,12 @@
add a validator for the "#" key that removes "#" when the user enters it in the stage name
- Created a function saveStage() that is called when the user edits the stage page and confirms, it trims the stage name value and add a alert for the "#" key
-
- Modified by Daniel Han 18/09/2012 - added stateNum parameter on saveStage for refresh stage or not.
-
+ * Modified by Daniel Han 18/09/2012 - added stateNum parameter on saveStage for refresh stage or not.
+
+ * Modified by Craig Farrell (CF) 08/04/2013 - add new methods for checking a checkbox named onstagelist(onStagelistToBeChecked(),onStageListChecked(),onStageListUnChecked() )
+ - add new component(the onstagelist checkbox) which needs to be saved and restored in the state methods.
+ - add to the load method so it check the checkbox if stage is on then stage list
*/
//Instance based variables
@@ -43,7 +45,7 @@
genColorTable("colorpicker");
displayAccess();
debugToBeChecked(document.rupert.debugTextMsg.value);
-
+
var cols = document.rupert.colorvals.value;
if(cols!='No stage selected')
{
@@ -64,6 +66,7 @@
//rm = document.getElementById("submit");
//rm.parentNode.removeChild(rm);
}
+ onStagelistToBeChecked(document.rupert.onstagelistMsg.value);//CF: on load it checks if the stage is on the stagelist.
}
/**
@@ -285,6 +288,7 @@
state[i+1] = document.getElementById("splash_message").value;
state[i+2] = document.getElementById("debug").checked;
state[i+3] = selector;
+ state[i+4] = document.getElementById("onstagelist").checked;//08/04/2013 -CF- add new component for the state to save
}
/**
* Put the page back as it was.
@@ -305,6 +309,7 @@
document.getElementById("debug").checked = state[i+2];
selector = state[i+3];
selectColoring(selector);
+ document.getElementById("onstagelist").checked = state[i+4];//08/04/2013 -CF- add new component for the state to load
//alert(selector); 07/11/20101 PR - Removed, because I couldn't see the point in this
state = undefined;
}
@@ -350,7 +355,35 @@
{
document.getElementById("debugTextMsg").value='normal';
}
+
/**
+* 08/04/2013 - by Craig Farrell.
+* this method checks the onstagelist checkbox if iss is equal to 'on'
+*/
+function onStagelistToBeChecked(iss){
+ if(iss == 'on')
+ {
+ document.getElementById("onstagelist").checked = 'checked';
+ }
+}
+
+/**
+* 08/04/2013 - by Craig Farrell.
+* this method checks the onstagelist checkbox
+*/
+function onStageListChecked(){
+ document.getElementById("onstagelistMsg").value='on';
+}
+
+/**
+* 08/04/2013 - by Craig Farrell.
+* this method unchecks the onstagelist checkbox
+*/
+function onStageListUnChecked(){
+ document.getElementById("onstagelistMsg").value='off';
+}
+
+/**
* Legacy method - Doesnt work with the new version of the site,
* just left in to remind us to add in a warning if the client wants it.
* @return
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2013-04-07 22:33:07 UTC (rev 495)
+++ branches/2.4.2/upstage/pages.py 2013-04-08 23:39:33 UTC (rev 496)
@@ -75,7 +75,10 @@
Modified by: Daniel 17/09/2012 - Added bgcolor and stage_message on stage page to display.
Modified by: Daniel 18/09/2012 - Added Save only on EditStage
Modified by: Gavin 5/10/2012 - Added errorMsg variable for different error titles
-Modified by: Scott/Craig/Gavin 10/10/2012 - Added stage_saved variable for saved message confirmation
+Modified by: Scott/Craig/Gavin 10/10/2012 - Added stage_saved variable for saved message confirmation
+Modified by: Craig Farrell 08/04/2013 - added new stagelist to home.xhtml page.
+ - added new stagelist to stages.xhtml page.
+ - added new text_onStageList.
"""
#standard lib
@@ -563,7 +566,8 @@
def text_list(self, request):
html_list = '<table id="playerAudience" class="stage_list" cellspacing="0"><tr><th> Name (url)</th><th>Players</th><th>Audience</th><th>Your Access</th></tr>'
- html_list += self.collection.html_list(self.text_username(request))
+ #slist = self.collection.load_StageList()#(08/04/2013) Craig
+ html_list += self.collection.html_list(self.text_username(request))#,slist)
html_list += '</table>'
return html_list
@@ -603,7 +607,8 @@
def text_list(self, request):
html_list = '<table id="playerAudience" class="stage_list" cellspacing="0"><tr><th> Name (url)</th><th>Players</th><th>Audience</th><th>Your Access</th></tr>'
- html_list += self.collection.html_list(self.text_username(request))
+ slist = self.collection.load_StageList()#(08/04/2013) Craig
+ html_list += self.collection.html_list(self.text_username(request),slist)
html_list += '</table>'
return html_list
@@ -691,6 +696,12 @@
return self.stage.debugMessages
else:
return self.no_stage
+
+ def text_onStageList(self, request):#(08/04/2013) Craig
+ if self.stage:
+ return self.stage.onStageList
+ else:
+ return self.no_stage
def text_name(self, request):
if self.stage:
@@ -1612,7 +1623,8 @@
return html_list(self.childClass.list_template)
html_list_text = '<table id="playerAudience" class="stage_list" cellspacing="0"><tr><th> Name (url)</th><th>Players</th><th>Audience</th><th>Your Access</th></tr>'
- html_list_text += html_list(self.text_username(request))
+ slist = self.collection.load_StageList()#(08/04/2013) Craig
+ html_list_text += html_list(self.text_username(request),slist)
html_list_text += '</table>'
return html_list_text
Modified: branches/2.4.2/upstage/stage.py
===================================================================
--- branches/2.4.2/upstage/stage.py 2013-04-07 22:33:07 UTC (rev 495)
+++ branches/2.4.2/upstage/stage.py 2013-04-08 23:39:33 UTC (rev 496)
@@ -35,6 +35,14 @@
Modified by: Daniel Han 11/09/2012 - Added Stage Access Checking.
Modified by: Daniel 18/09/2012 - Added Save only without refreshing.
Modified by: Craig Farrell 18/09/2012 - removed method call, so when set to defealt is called it doesn't unassign the media from stage.
+Modified by: Craig Farrell 08/04/2013 - added new onStageList = 'on' variable && new onStageList varible to set_default()
+ - added new onstagelist node to load() && new onstagelist to the tree in save().
+ - added new onstagelistMsg to form in the update_from_form()
+ - added two new methods : set_ifOnStageList() && get_ifOnStageList()
+ - changed parse_element to include the new onStageList Attribute.
+ - added new onstaglist node to write_element()
+ - added new load_StageList() method to make list of stage that are set to be visable on stagelist.
+ - changed html_list so it includes the new stagelist as well as the old && it has a save call now to update stages.xml
"""
#std lib
@@ -78,6 +86,7 @@
toolsBgColour = '0xFFFFFF'
pageBgColour = '0xFFFFFF'
debugMessages = 'normal'#(12/11/08)Aaron added to displays debug messages or not 'Normal' or 'DEBUG'
+ onStageList = 'on'#(08/04/2013)Craig added to displays onStageList or not : 'on' or 'off'
def __init__(self, ID, name=None, owner=None):
@@ -116,6 +125,7 @@
self.toolsBgColour = '0xFFFFFF'
self.pageBgColour = '0xFFFFFF'
self.debugMessages = 'normal'#(12/11/08)Aaron added to displays debug messages or not 'Normal' or 'DEBUG'
+ self.onStageList = 'on'#(08/04/2013)Craig added to displays onStageList or not : 'on' or 'off'
def reset(self):
@@ -170,6 +180,7 @@
accessTwoNodes = tree.getElementsByTagName('access_two')
accessThreeNodes = tree.getElementsByTagName('access_three')
debugScreenNodes = tree.getElementsByTagName('showDebugScreen')
+ onStageListNodes = tree.getElementsByTagName('onstageList')#(08/04/2013)Craig
try:
#Heath Behrens 10/08/2011 - changed the if statements so they now check for none and process each
@@ -198,6 +209,8 @@
self.access_level_three.append(x) # Heath Behrens 10/08/2011 - append the item to the list
if debugScreenNodes and debugScreenNodes[0].firstChild() is not None:
self.debugMessages = debugScreenNodes[0].firstChild().toxml()
+ if onStageListNodes and onStageListNodes[0].firstChild() is not None:#(08/04/2013)Craig
+ self.onStageList = onStageListNodes[0].firstChild().toxml()
except Exception, e:
print "Couldn't set splash message for '%s', because '%s'" % (self, e)
@@ -239,6 +252,7 @@
tree['name'] = self.name
tree['id'] = self.ID
tree['created'] = self.created
+ tree['onstagelist'] =self.onStageList #(08/04/2013)Craig
if self.active:
tree['active'] = 'active'
if self.splash_message != self.__class__.splash_message:
@@ -252,6 +266,9 @@
if self.debugMessages != self.__class__.debugMessages:
showDebugScreen = tree.add('showDebugScreen')
showDebugScreen.text(self.debugMessages)
+ if self.onStageList != self.__class__.onStageList:#(08/04/2013)Craig
+ onstageList = tree.add('onstageList')
+ onstageList.text(self.onStageList)
for x in self.get_avatar_list():
# log.msg("Voices: %s %s " %(x.voice,x.media.voice))
tree.add(self.avatars.typename, media=x.media.file, showname=x.show_name,
@@ -294,6 +311,8 @@
nodeToolsBgColour.text(self.toolsBgColour)
nodePageBgColour = tree.add('pageBgColour')
nodePageBgColour.text(self.pageBgColour)
+ nodeOnStageList = tree.add('onStageList')#(08/04/2013)Craig
+ nodeOnStageList.text(self.onStageList)
save_xml(tree.node, config_file)
del tree
@@ -455,6 +474,9 @@
if 'debugTextMsg' in form:
self.debugMessages = form['debugTextMsg'][0]
log.msg(self.debugMessages)
+ if 'onstagelistMsg' in form: #(08/04/2013)Craig
+ self.onStageList = form['onstagelistMsg'][0]
+ log.msg(self.onStageList)
#log.msg('FORM: %s' %form)
uploaders_collection = {}
@@ -598,8 +620,15 @@
return "Player"
else:
return "Audience"
-
+ #added by Craig (08/04/2013) - sets the onstagelist on or off
+ def set_ifOnStageList(self,iss):
+ if iss == 'on' or iss == 'off':
+ self.onStageList = iss
+ #added by Craig (08/04/2013) - gets the onstagelist on or off
+ def get_ifOnStageList(self):
+ return self.onStageList
+
# Added by Daniel (11/09/2012) - check if player is audience
def isPlayerAudience(self, player):
@@ -960,6 +989,7 @@
ID = node.getAttribute('id')
name = node.getAttribute('name')
s = _Stage(ID, name, self)
+ s.set_ifOnStageList((node.getAttribute('onstagelist'))) #(08/04/2013)Craig
dict.__setitem__(self, ID, s)
if active:
s.wake()
@@ -979,8 +1009,8 @@
node = root.add(self.element, id=ID, name=stage.name)
if stage.active:
node['active']='active'
+ node['onstagelist']= stage.get_ifOnStageList() #(08/04/2013)Craig
-
def update_from_form(self, form, player):
"""Delete selected stages"""
log.msg("Dict (Delete) update from form called")
@@ -1042,12 +1072,42 @@
def log_stage_message(self):
log.msg("TRYING TO GET STAGE ID: %s" % self['id'])
-
- def html_list(self, playerName='', include='stage_item_set.inc'):
+
+ #added by Craig (08/04/2013) - this gets all the stages which have been set to be on the stagelist
+ def load_StageList(self, xmlfile = config.STAGES_XML, element = 'stage', root = 'stages'):
+ log.msg("TRYING TO LOAD STAGELIST: ")
+ self.save()
+ sL = dict()
+ tree = microdom.parse(xmlfile)# gets tree from xml file
+ nodes = tree.getElementsByTagName(element)
+ for node in nodes:
+ active = node.getAttribute('active')
+ ID = node.getAttribute('id')
+ name = node.getAttribute('name')
+ s = _Stage(ID, name, self)
+ onSList = node.getAttribute('onstagelist')
+ if onSList == 'on':# if onstagelist is 'on', put in list.
+ sL[ID] = s
+ if active:
+ s.wake()
+ else:
+ s.sleep()
+ del tree
+ return sL
+
+
+ def html_list(self, playerName='',onStaList =None, include='stage_item_set.inc'):
"""make a list of stages as a set of table rows"""
- things = [(ID.lower(), {'name': stage.name,
+ self.save();#(08/04/2013)Craig- makes sure the stages.xml is up to date
+ if onStaList != None:#(08/04/2013)Craig - change to list which is needed
+ things = [(ID.lower(), {'name': stage.name,
'ID': ID
})
+ for ID, stage in onStaList.items()]
+ else:
+ things = [(ID.lower(), {'name': stage.name,
+ 'ID': ID
+ })
for ID, stage in self.items()]
things.sort() # alphabetical (note: things is schwartzian)
tmpl = get_template(include)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2013-04-07 22:33:18
|
Revision: 495
http://upstage.svn.sourceforge.net/upstage/?rev=495&view=rev
Author: aut-upstage
Date: 2013-04-07 22:33:07 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
08/04/2013 Craig Farrell- fixed the audio loop bug, also i fixed the prop size bug.
works on all browsers except i haven't tested on safari due to the new safari requires 64bit OS.
Modified Paths:
--------------
branches/2.4.2/client/src/Client.as
branches/2.4.2/client/src/model/ModelSounds.as
branches/2.4.2/client/src/thing/Thing.as
branches/2.4.2/html/swf/classes.swf
branches/2.4.2/html/swf/client.swf
Modified: branches/2.4.2/client/src/Client.as
===================================================================
--- branches/2.4.2/client/src/Client.as 2013-03-06 01:43:36 UTC (rev 494)
+++ branches/2.4.2/client/src/Client.as 2013-04-07 22:33:07 UTC (rev 495)
@@ -26,6 +26,7 @@
* Modules should never modify a value here.
* Modified by: Heath Behrens & Vibhu Patel 08/08/2011 - Added lines 38-41 which are used to scale
* avatars and props.
+ * Modified by: Craig Farrell (CF) 08/04/2013 - changed prop max height and width to 50 because props aren't meant to be big.
*/
class Client
{
@@ -37,9 +38,10 @@
//----------- sizes --------------------------//
public static var AVATAR_MAX_WIDTH :Number = 100;
//--Added by Heath & Vibhu used to scale avatars and props
+ // CF - changed prop max height and width to 50
public static var AVATAR_MAX_HEIGHT :Number = 100;
- public static var PROP_MAX_WIDTH :Number = 100;
- public static var PROP_MAX_HEIGHT :Number = 100;
+ public static var PROP_MAX_WIDTH :Number = 50;
+ public static var PROP_MAX_HEIGHT :Number = 50;
public static var ICON_SIZE :Number = 10; // In AvScrollBar & ItemGroup's
public static var BORDER_WIDTH :Number = 0.5;
Modified: branches/2.4.2/client/src/model/ModelSounds.as
===================================================================
--- branches/2.4.2/client/src/model/ModelSounds.as 2013-03-06 01:43:36 UTC (rev 494)
+++ branches/2.4.2/client/src/model/ModelSounds.as 2013-04-07 22:33:07 UTC (rev 495)
@@ -37,7 +37,11 @@
* that has the least amount of time left
*
* Sound objects are created once & reused
- *
+ * History
+ * Date Name Code name What you did
+ * ------------------------------------------------------
+ * 8-04-2013 Craig Farrell CF - made the _play method stop playing audios that are being replaced.
+ *
*/
class model.ModelSounds implements TransportInterface
{
@@ -181,7 +185,11 @@
if (isNaN(slot)) //still no luck (all loading?). go for default
slot = offset;
-
+ //CF - stops playing sounds that are being replaced
+ var ns: newSound = sounds[slot];
+ ns.stop();
+ audioScrollBar.clearSlot(arrayName, slot);
+ //CF - assigns new audio
sounds[slot] = new newSound();
sounds[slot].url = url;
sounds[slot].type = arrayName;
Modified: branches/2.4.2/client/src/thing/Thing.as
===================================================================
--- branches/2.4.2/client/src/thing/Thing.as 2013-03-06 01:43:36 UTC (rev 494)
+++ branches/2.4.2/client/src/thing/Thing.as 2013-04-07 22:33:07 UTC (rev 495)
@@ -27,7 +27,7 @@
*
* Modified by: Heath Behrens & Vibhu Patel 08/08/2011 - Modified function Added line which calls Construct
* to scale the prop on stage
- *
+ * Modified by: Craig Farrell (CF) 08/04/2013 - added: checks the size of prop and resizes it to the correct size for the stage when loaded
*/
class thing.Thing extends MovieClip
{
@@ -100,11 +100,33 @@
if(is_prop && !listener){
var thing: Thing = this;
listener = LoadTracker.getLoadListener();
- listener.onLoadInit = function(mc: MovieClip){
+ listener.onLoadInit = function(mc: MovieClip) {
+ //CF - checks the size of prop and resizes it to the correct size for the stage.
+ var rightHeight :Boolean =false;
+ var rightWidth :Boolean =false;
+ while(rightWidth == false)
+ {
+ if (mc._width <= Client.PROP_MAX_WIDTH )
+ {rightWidth = true; }
+ else
+ {
+ mc._width = (mc._width - (mc._width * .1))
+ mc._height = (mc._height - (mc._height * .1))
+ }
+ }
+ while(rightHeight == false)
+ {
+ if (mc._height <= Client.PROP_MAX_HEIGHT)
+ {rightHeight = true; }
+ else
+ {
+ mc._width = (mc._width - (mc._width * .1))
+ mc._height = (mc._height - (mc._height * .1))
+ }
+ }
//Modified by: Heath / Vibhu 08/08/2011 - Added to scale the prop on stage.
- mc._width = Client.PROP_MAX_WIDTH;
- mc._height = Client.PROP_MAX_HEIGHT;
-
+ //mc._width = Client.PROP_MAX_WIDTH;
+ //mc._height = Client.PROP_MAX_HEIGHT;
thing.image = mc;
thing.finalise();
};
Modified: branches/2.4.2/html/swf/classes.swf
===================================================================
(Binary files differ)
Modified: branches/2.4.2/html/swf/client.swf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2013-03-06 01:43:44
|
Revision: 494
http://upstage.svn.sourceforge.net/upstage/?rev=494&view=rev
Author: aut-upstage
Date: 2013-03-06 01:43:36 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
Gavin Changed the action[type] to 5 on the warn function in masterpage.js to allow the media to be deleted
Modified Paths:
--------------
branches/2.4.2/html/masterpage.js
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2013-03-01 00:02:48 UTC (rev 493)
+++ branches/2.4.2/html/masterpage.js 2013-03-06 01:43:36 UTC (rev 494)
@@ -30,6 +30,7 @@
and if so, page is redirected to /admin/home or /admin/stages
Modified by Scott (10/10/2012) -Added navHomeUser() method, so when the user logs out it redirects to /home instead of /admin/home
Modified by Scott/Craig/Gavin (10/10/2012) -Added embsMessage method to embbed the stage save success message into stageedit.xhtml
+ Modified by Gavin (6/3/2013): Changed actions[type] to actions[5] to also delete the media on warn(type) function.
*/
//Instance type variables
@@ -834,17 +835,14 @@
if(doIt)
{
// Vibhu and Karena (09/08/2011): Deselects selected media.
- if(type == 5 )
+ if(type == 5 || type == 7)
{
mediaSelected = false;
}
- if(type == 7 )
- {
- mediaSelected = false;
- }
+ // Gavin (6/3/13): Changed actions[type] to actions[5] to also delete the media
document.getElementById("status").innerHTML = 'Sending to server, please wait...';
document.getElementById("status").style.display = "inline";
- document.rupert.action.value = actions[type];
+ document.rupert.action.value = actions[5];
requestPage("POST", buildRequest(2),fillPage);
//18/05/2011 Navigates back to stage workshop page (Vibhu Patel)
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2013-03-01 00:02:57
|
Revision: 493
http://upstage.svn.sourceforge.net/upstage/?rev=493&view=rev
Author: aut-upstage
Date: 2013-03-01 00:02:48 +0000 (Fri, 01 Mar 2013)
Log Message:
-----------
1/03/2013 Craig Farrell - changed the save stage message on edit stage.
Modified Paths:
--------------
branches/2.4.2/html/masterpage.js
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2013-02-28 23:37:12 UTC (rev 492)
+++ branches/2.4.2/html/masterpage.js 2013-03-01 00:02:48 UTC (rev 493)
@@ -50,7 +50,7 @@
'Warning: This will cause the stage to reload for everyone currently on it, and you will loose the chat log. Do you wish to proceed?',
'Any changes you have made will be saved, overwriting prevoius settings. Do you wish to proceed?',
'This stage will be permanently deleted. Do you wish to proceed? (This will not delete any media that has been assigned to this stage.)',
- 'This will save the stage, losing any previous settings without reloading the stage. Do you wish to proceed?',
+ 'This will save the stage. Do you wish to proceed?',
'This media item will be permanently deleted. Do you wish to proceed?"'
]
var actions = ['save', 'cancel', 'delete', 'reset', 'save', 'delete', 'saveonly']; //Dont really need these, just makes server code more readable.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2013-02-28 23:37:19
|
Revision: 492
http://upstage.svn.sourceforge.net/upstage/?rev=492&view=rev
Author: aut-upstage
Date: 2013-02-28 23:37:12 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
1/03/2013 Craig Farrell. fixed text mis-spell.
Modified Paths:
--------------
branches/2.4.2/config/templates/stageedit.xhtml
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2012-12-04 04:02:25 UTC (rev 491)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2013-02-28 23:37:12 UTC (rev 492)
@@ -44,7 +44,7 @@
</tr>
<tr>
<td>Short name for URL:</td>
- <td><input type="text" name="shortName" value="%(ID)s" size="20" readonly="readonly"/>(Used for URL)</td>
+ <td><input type="text" name="shortName" value="%(ID)s" size="20" readonly="readonly"/>(used for URL)</td>
</tr>
<tr>
<td colspan="2"> %(attr:stage_link)s </td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-12-04 04:02:34
|
Revision: 491
http://upstage.svn.sourceforge.net/upstage/?rev=491&view=rev
Author: aut-upstage
Date: 2012-12-04 04:02:25 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Gavin/Scott - Updated working voices.py with the fixed text2wave
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-12-04 03:52:30 UTC (rev 490)
+++ branches/2.4.2/upstage/voices.py 2012-12-04 04:02:25 UTC (rev 491)
@@ -87,7 +87,7 @@
# manually installed festival 2.1
# TODO: check that the correct "text2wave" ist used!
def _festival3(voice, hz, options=''):
- s = ''.join((echo_in, timeout, "/usr/local/src/festival/bin/text2wave -eval '%s' " % voice,
+ s = ''.join((echo_in, timeout, "/usr/bin/text2wave -eval '%s' " % voice,
options, " -otype wav - -o - ", log,
(fest_lame % hz), log))
return [s]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-12-04 03:52:39
|
Revision: 490
http://upstage.svn.sourceforge.net/upstage/?rev=490&view=rev
Author: aut-upstage
Date: 2012-12-04 03:52:30 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Gavin/Scott - Updated working voices.py with the fixed text2wave
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-12-04 02:33:12 UTC (rev 489)
+++ branches/2.4.2/upstage/voices.py 2012-12-04 03:52:30 UTC (rev 490)
@@ -67,7 +67,7 @@
# FIXME: seems unused right now!
#text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
-text2wave = '/usr/local/src/festival/bin/text2wave'
+text2wave = '/usr/bin/text2wave'
#these functions are run over the definitions in VOICE_KIT, below, to
#create the appropriate shell script for each voice.
@@ -230,7 +230,7 @@
#'e_en-croak': (_espeak, ("en/en-croak ",)),
'e_en-n': (_espeak, ("en/en-n ",)),
#'e_en-r': (_espeak, ("en/en-r ",)),
- 'e_en-r': (_espeak, ("en/en-us ",)),
+ 'e_en-r': (_espeak, ("en/en-us1 ",)),
'e_en-rp': (_espeak, ("en/en-rp ",)),
'e_en-sc': (_espeak, ("en/en-sc ",)),
'e_en-wm': (_espeak, ("en/en-wm ",)),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-12-04 02:33:19
|
Revision: 489
http://upstage.svn.sourceforge.net/upstage/?rev=489&view=rev
Author: aut-upstage
Date: 2012-12-04 02:33:12 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Gavin/Scott - updated voices in regards to martins changes
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-12-04 02:25:05 UTC (rev 488)
+++ branches/2.4.2/upstage/voices.py 2012-12-04 02:33:12 UTC (rev 489)
@@ -45,23 +45,30 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
+#fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
+fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 44.10 - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
-
+#espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
+espeak_mbrola_lame = "%s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
espeak_lame = " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
espeak_cleanup = " rm $1.wav "
#Heath Behrens - Need to declare to possible paths for mbrola voices.
-path_to_embrola = " /usr/local/share/mbrola/"
+path_to_embrola = "/usr/share/mbrola/"
#Heath Behrens - this is the path to some of the voices that install in a different location.
#The other option is to simply copy all voices from the folder to the previous folder.
-path_to_embrola_alt = "/usr/local/share/mbrola/voices"
+path_to_embrola_alt = "/usr/share/mbrola/voices"
-text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
+# freshly downloaded mbrola voices
+# cause: "Binary error", see: http://tcts.fpms.ac.be/synthesis/mbrola/mbrfaq.html#Q2
+path_to_embrola_voices = "/usr/local/share/mbrola/"
+# FIXME: seems unused right now!
+#text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
+text2wave = '/usr/local/src/festival/bin/text2wave'
+
#these functions are run over the definitions in VOICE_KIT, below, to
#create the appropriate shell script for each voice.
@@ -77,6 +84,14 @@
(fest_lame % hz), log))
return [s]
+# manually installed festival 2.1
+# TODO: check that the correct "text2wave" ist used!
+def _festival3(voice, hz, options=''):
+ s = ''.join((echo_in, timeout, "/usr/local/src/festival/bin/text2wave -eval '%s' " % voice,
+ options, " -otype wav - -o - ", log,
+ (fest_lame % hz), log))
+ return [s]
+
def _rsynth(options):
exe = find_executable('rsynth-say')
if not exe:
@@ -103,8 +118,11 @@
mbrola = find_executable('mbrola')
if not espeak or not mbrola:
return None
+ #s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
+ # " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice,
+ # " - $1.wav ", log))
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, path_to_embrola, mbvoice,
+ " | ", mbrola, " -e ", mboptions, " " + path_to_embrola_voices, mbvoice,
" - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
@@ -113,48 +131,94 @@
VOICE_KIT = {
#Shaun Narayan (01/23/10) - Changed sampling rate (from 16 to 8) for all festival voices as after voices bug fix they were too fast
#debian packaged festival/mbrola:
- 'default': (_festival, ('(voice_us1_mbrola)', 8 )),
- 'roger': (_festival, ('(voice_en1_mbrola)', 8)),
- 'bud': (_festival, ('(voice_us2_mbrola)', 8)),
- 'randy': (_festival, ('(voice_us3_mbrola)', 8)),
+ #'default': (_festival, ('(voice_us1_mbrola)', 8 )),
+ #'roger': (_festival, ('(voice_en1_mbrola)', 8)),
+ #'bud': (_festival, ('(voice_us2_mbrola)', 8)),
+ #'randy': (_festival, ('(voice_us3_mbrola)', 8)),
+ # ------
+ 'default': (_festival, ('(voice_us1_mbrola)', 16)),
+ 'roger': (_festival, ('(voice_en1_mbrola)', 16)),
+ 'bud': (_festival, ('(voice_us2_mbrola)', 16)),
+ 'randy': (_festival, ('(voice_us3_mbrola)', 16)),
#debian packaged festival/festival
- 'kal': (_festival, ('(voice_kal_diphone)', 8)),
- 'ked': (_festival, ('(voice_ked_diphone)', 8)),
- 'rab': (_festival, ('(voice_rab_diphone)', 8)),
- 'don': (_festival, ('(voice_don_diphone)', 5)),
+ #'kal': (_festival, ('(voice_kal_diphone)', 8)),
+ #'ked': (_festival, ('(voice_ked_diphone)', 8)),
+ #'rab': (_festival, ('(voice_rab_diphone)', 8)),
+ #'don': (_festival, ('(voice_don_diphone)', 5)),
+ # ------
+ 'kal': (_festival, ('(voice_kal_diphone)', 16)),
+ 'ked': (_festival, ('(voice_ked_diphone)', 16)),
+ 'rab': (_festival, ('(voice_rab_diphone)', 16)),
+ 'don': (_festival, ('(voice_don_diphone)', 16)),
#compiled festival
- 'slt_cmu': (_festival2, ('(voice_cmu_us_slt_arctic_clunits)', 8)),
- 'slt_nitech': (_festival2, ('(voice_nitech_us_slt_arctic_hts)', 8)),
- 'awb_cmu': (_festival2, ('(voice_cmu_us_awb_arctic_clunits)', 8)),
- 'awb_nitech': (_festival2, ('(voice_nitech_us_awb_arctic_hts)', 8)),
- 'clb_nitech': (_festival2, ('(voice_nitech_us_clb_arctic_hts)', 8)),
- 'bdl_cmu': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
- 'bdl_nitech': (_festival2, ('(voice_nitech_us_bdl_arctic_hts)', 8)),
- 'jmk_cmu': (_festival2, ('(voice_cmu_us_jmk_arctic_clunits)', 8)),
- 'jmk_nitech': (_festival2, ('(voice_nitech_us_jmk_arctic_hts)', 8)),
- 'rms_nitech': (_festival2, ('(voice_nitech_us_rms_arctic_hts)', 8)),
- 'rms_faster': (_festival2, ('(voice_nitech_us_rms_arctic_hts)', 8, " -F 11025")),
+ #'slt_cmu': (_festival2, ('(voice_cmu_us_slt_arctic_clunits)', 8)),
+ #'slt_nitech': (_festival2, ('(voice_nitech_us_slt_arctic_hts)', 8)),
+ #'awb_cmu': (_festival2, ('(voice_cmu_us_awb_arctic_clunits)', 8)),
+ #'awb_nitech': (_festival2, ('(voice_nitech_us_awb_arctic_hts)', 8)),
+ #'clb_nitech': (_festival2, ('(voice_nitech_us_clb_arctic_hts)', 8)),
+ #'bdl_cmu': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
+ #'bdl_nitech': (_festival2, ('(voice_nitech_us_bdl_arctic_hts)', 8)),
+ #'jmk_cmu': (_festival2, ('(voice_cmu_us_jmk_arctic_clunits)', 8)),
+ #'jmk_nitech': (_festival2, ('(voice_nitech_us_jmk_arctic_hts)', 8)),
+ #'rms_nitech': (_festival2, ('(voice_nitech_us_rms_arctic_hts)', 8)),
+ #'rms_faster': (_festival2, ('(voice_nitech_us_rms_arctic_hts)', 8, " -F 11025")),
+ # -----
+ 'slt_cmu': (_festival3, ('(voice_cmu_us_slt_arctic_hts)', 16)),
+ 'slt_nitech': (_festival3, ('(voice_nitech_us_slt_arctic_hts)', 16)),
+ 'awb_cmu': (_festival3, ('(voice_cmu_us_awb_arctic_hts)', 16)),
+ 'awb_nitech': (_festival3, ('(voice_nitech_us_awb_arctic_hts)', 16)),
+ 'clb_nitech': (_festival3, ('(voice_nitech_us_clb_arctic_hts)', 16)),
+ 'bdl_cmu': (_festival3, ('(voice_cmu_us_bdl_arctic_hts)', 16)),
+ 'bdl_nitech': (_festival3, ('(voice_nitech_us_bdl_arctic_hts)', 16)),
+ 'jmk_cmu': (_festival3, ('(voice_cmu_us_jmk_arctic_hts)', 16)),
+ 'jmk_nitech': (_festival3, ('(voice_nitech_us_jmk_arctic_hts)', 16)),
+ 'rms_nitech': (_festival3, ('(voice_nitech_us_rms_arctic_hts)', 16)),
+ # rms does not work "faster"
+ #'rms_faster': (_festival3, ('(voice_nitech_us_rms_arctic_hts)', 8, " -F 11.025")),
###Shaun Narayan (02/22/10) - New voices
- 'bdl_cmu': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
- 'ksp_cmu': (_festival2, ('(voice_cmu_us_ksp_arctic_clunits)', 8)),
- 'rms_cmu': (_festival2, ('(voice_cmu_us_rms_arctic_clunits)', 8)),
- 'kal_cmu': (_festival2, ('(voice_cmu_us_kal_com_clunits)', 8)),
- 'kal_cmu_faster': (_festival2, ('(voice_cmu_us_kal_com_clunits)', 8, " -F 11025")),
- 'bdl_cmu_faster': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
- 'ksp_cmu_faster': (_festival2, ('(voice_cmu_us_ksp_arctic_clunits)', 8, " -F 11025")),
- 'rms_cmu_faster': (_festival2, ('(voice_cmu_us_rms_arctic_clunits)', 8, " -F 11025")),
- 'slt_cmu_faster': (_festival2, ('(voice_cmu_us_slt_arctic_clunits)', 8, " -F 11025")),
- 'slt_nitech_faster': (_festival2, ('(voice_nitech_us_slt_arctic_hts)', 8, " -F 11025")),
- 'awb_cmu_faster': (_festival2, ('(voice_cmu_us_awb_arctic_clunits)', 8, " -F 11025")),
- 'awb_nitech_faster': (_festival2, ('(voice_nitech_us_awb_arctic_hts)', 8, " -F 11025")),
- 'clb_nitech_faster': (_festival2, ('(voice_nitech_us_clb_arctic_hts)', 8, " -F 11025")),
- 'bdl_cmu_faster': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
- 'bdl_nitech_faster': (_festival2, ('(voice_nitech_us_bdl_arctic_hts)', 8, " -F 11025")),
- 'jmk_cmu_faster': (_festival2, ('(voice_cmu_us_jmk_arctic_clunits)', 8, " -F 11025")),
- 'jmk_nitech_faster': (_festival2, ('(voice_nitech_us_jmk_arctic_hts)', 8, " -F 11025")),
+ #'bdl_cmu': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8)),
+ #'ksp_cmu': (_festival2, ('(voice_cmu_us_ksp_arctic_clunits)', 8)),
+ #'rms_cmu': (_festival2, ('(voice_cmu_us_rms_arctic_clunits)', 8)),
+ #'kal_cmu': (_festival2, ('(voice_cmu_us_kal_com_clunits)', 8)),
+ #'kal_cmu_faster': (_festival2, ('(voice_cmu_us_kal_com_clunits)', 8, " -F 11025")),
+ #'bdl_cmu_faster': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
+ #'ksp_cmu_faster': (_festival2, ('(voice_cmu_us_ksp_arctic_clunits)', 8, " -F 11025")),
+ #'rms_cmu_faster': (_festival2, ('(voice_cmu_us_rms_arctic_clunits)', 8, " -F 11025")),
+ #'slt_cmu_faster': (_festival2, ('(voice_cmu_us_slt_arctic_clunits)', 8, " -F 11025")),
+ #'slt_nitech_faster': (_festival2, ('(voice_nitech_us_slt_arctic_hts)', 8, " -F 11025")),
+ #'awb_cmu_faster': (_festival2, ('(voice_cmu_us_awb_arctic_clunits)', 8, " -F 11025")),
+ #'awb_nitech_faster': (_festival2, ('(voice_nitech_us_awb_arctic_hts)', 8, " -F 11025")),
+ #'clb_nitech_faster': (_festival2, ('(voice_nitech_us_clb_arctic_hts)', 8, " -F 11025")),
+ #'bdl_cmu_faster': (_festival2, ('(voice_cmu_us_bdl_arctic_clunits)', 8, " -F 11025")),
+ #'bdl_nitech_faster': (_festival2, ('(voice_nitech_us_bdl_arctic_hts)', 8, " -F 11025")),
+ #'jmk_cmu_faster': (_festival2, ('(voice_cmu_us_jmk_arctic_clunits)', 8, " -F 11025")),
+ #'jmk_nitech_faster': (_festival2, ('(voice_nitech_us_jmk_arctic_hts)', 8, " -F 11025")),
+ # ------
+ # bdl_cmu already defined: commented out
+ #'bdl_cmu': (_festival3, ('(voice_cmu_us_bdl_arctic_hts)', 16)),
+ # ksp and rms do not work:
+ #'ksp_cmu': (_festival3, ('(voice_cmu_us_ksp_arctic_hts)', 16)),
+ #'rms_cmu': (_festival3, ('(voice_cmu_us_rms_arctic_hts)', 16)),
+ # kal_cmu does not exist: commented out
+ #'kal_cmu': (_festival3, ('(voice_cmu_us_kal_com_hts)', 16)),
+ # all "faster" versions commented out, as they will not work (without sox or similar)
+ #'kal_cmu_faster': (_festival3, ('(voice_cmu_us_kal_com_hts)', 16, " -F 8000")),
+ #'bdl_cmu_faster': (_festival3, ('(voice_cmu_us_bdl_arctic_hts)', 8, " -F 8000")),
+ #'ksp_cmu_faster': (_festival3, ('(voice_cmu_us_ksp_arctic_hts)', 8, " -F 8000")),
+ #'rms_cmu_faster': (_festival3, ('(voice_cmu_us_rms_arctic_hts)', 8, " -F 8000")),
+ #'slt_cmu_faster': (_festival3, ('(voice_cmu_us_slt_arctic_hts)', 8, " -F 8000")),
+ #'slt_nitech_faster': (_festival3, ('(voice_nitech_us_slt_arctic_hts)', 8, " -F 8000")),
+ #'awb_cmu_faster': (_festival3, ('(voice_cmu_us_awb_arctic_hts)', 8, " -F 8000")),
+ #'awb_nitech_faster': (_festival3, ('(voice_nitech_us_awb_arctic_hts)', 8, " -F 8000")),
+ #'clb_nitech_faster': (_festival3, ('(voice_nitech_us_clb_arctic_hts)', 8, " -F 8000")),
+ #'bdl_cmu_faster': (_festival3, ('(voice_cmu_us_bdl_arctic_hts)', 8, " -F 8000")),
+ #'bdl_nitech_faster': (_festival3, ('(voice_nitech_us_bdl_arctic_hts)', 8, " -F 8000")),
+ #'jmk_cmu_faster': (_festival3, ('(voice_cmu_us_jmk_arctic_hts)', 8, " -F 8000")),
+ #'jmk_nitech_faster': (_festival3, ('(voice_nitech_us_jmk_arctic_hts)', 8, " -F 8000")),
+
#rsynth:
'slow': (_rsynth, (" -x 1200 -S 3 ",)),
'high': (_rsynth, (" -x 2800 -S 1.4 ",)),
@@ -165,7 +229,8 @@
'e_en': (_espeak, ("en/en ",)),
#'e_en-croak': (_espeak, ("en/en-croak ",)),
'e_en-n': (_espeak, ("en/en-n ",)),
- 'e_en-r': (_espeak, ("en/en-r ",)),
+ #'e_en-r': (_espeak, ("en/en-r ",)),
+ 'e_en-r': (_espeak, ("en/en-us ",)),
'e_en-rp': (_espeak, ("en/en-rp ",)),
'e_en-sc': (_espeak, ("en/en-sc ",)),
'e_en-wm': (_espeak, ("en/en-wm ",)),
@@ -175,13 +240,15 @@
#'e_en-croak+11': (_espeak, ("en/en-croak+11 ",)),
'e_en-n-f2': (_espeak, ("en/en-n+12 ",)),
- 'e_en-r-f3': (_espeak, ("en/en-r+13 ",)),
+ #'e_en-r-f3': (_espeak, ("en/en-r+13 ",)),
+ 'e_en-r-f3': (_espeak, ("en/en-us+13 ",)),
'e_en-rp-f1': (_espeak, ("en/en-rp+11 ",)),
'e_en-sc-f1': (_espeak, ("en/en-sc+11 ",)),
'e_en-wm-f1': (_espeak, ("en/en-wm+11 ",)),
#'e_en-croak-f4': (_espeak, ("en/en-croak+14 ",)),
'e_en-n-f4': (_espeak, ("en/en-n+14 ",)),
- 'e_en-r-f4': (_espeak, ("en/en-r+14 ",)),
+ #'e_en-r-f4': (_espeak, ("en/en-r+14 ",)),
+ 'e_en-r-f4': (_espeak, ("en/en-us+14 ",)),
'e_en-rp-f4': (_espeak, ("en/en-rp+14 ",)),
'e_en-sc-f4': (_espeak, ("en/en-sc+14 ",)),
'e_en-wm-f4': (_espeak, ("en/en-wm+14 ",)),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-12-04 02:25:15
|
Revision: 488
http://upstage.svn.sourceforge.net/upstage/?rev=488&view=rev
Author: aut-upstage
Date: 2012-12-04 02:25:05 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
4/12/2012 Craig Farrell
- changed the set to default method for the edit stage. so now it doesn't un-assign the media from the stage.
Modified Paths:
--------------
branches/2.4.2/upstage/stage.py
Modified: branches/2.4.2/upstage/stage.py
===================================================================
--- branches/2.4.2/upstage/stage.py 2012-12-04 02:06:28 UTC (rev 487)
+++ branches/2.4.2/upstage/stage.py 2012-12-04 02:25:05 UTC (rev 488)
@@ -34,6 +34,7 @@
Modified by: Daniel Han 11/09/2012 - Added Stage Access Checking.
Modified by: Daniel 18/09/2012 - Added Save only without refreshing.
+Modified by: Craig Farrell 18/09/2012 - removed method call, so when set to defealt is called it doesn't unassign the media from stage.
"""
#std lib
@@ -109,7 +110,6 @@
def set_default(self):
self.wake()
- self.clear()
self.splash_message = 'Welcome to UpStage'
self.backgroundPropBgColour = '0xFFFFFF'
self.chatBgColour = '0xFFFFFF'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-12-04 02:06:34
|
Revision: 487
http://upstage.svn.sourceforge.net/upstage/?rev=487&view=rev
Author: aut-upstage
Date: 2012-12-04 02:06:28 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Gavin/Scott - Updated working voices.py with the fixed mbrola voices
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-30 01:31:27 UTC (rev 486)
+++ branches/2.4.2/upstage/voices.py 2012-12-04 02:06:28 UTC (rev 487)
@@ -47,7 +47,7 @@
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " | %s lame -S --quiet -x -m m -s 16 --resample 22.05 --preset phone - $1" % timeout
+espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
@@ -55,7 +55,7 @@
espeak_cleanup = " rm $1.wav "
#Heath Behrens - Need to declare to possible paths for mbrola voices.
-path_to_embrola = "/usr/local/share/mbrola"
+path_to_embrola = " /usr/local/share/mbrola/"
#Heath Behrens - this is the path to some of the voices that install in a different location.
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/local/share/mbrola/voices"
@@ -104,7 +104,7 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- mbrola, " -e ", mboptions, " " + "/usr/local/share/mbrola/", mbvoice,
+ " | ", mbrola, " -e ", mboptions, path_to_embrola, mbvoice,
" - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-30 01:31:33
|
Revision: 486
http://upstage.svn.sourceforge.net/upstage/?rev=486&view=rev
Author: aut-upstage
Date: 2012-11-30 01:31:27 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
30-11-2012 Gavin
added slash to a path.
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-30 00:20:31 UTC (rev 485)
+++ branches/2.4.2/upstage/voices.py 2012-11-30 01:31:27 UTC (rev 486)
@@ -104,7 +104,7 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- mbrola, " -e ", mboptions, " " + "/usr/local/share/mbrola", mbvoice,
+ mbrola, " -e ", mboptions, " " + "/usr/local/share/mbrola/", mbvoice,
" - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-30 00:20:39
|
Revision: 485
http://upstage.svn.sourceforge.net/upstage/?rev=485&view=rev
Author: aut-upstage
Date: 2012-11-30 00:20:31 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
30-11-2012 Craig Farrell
change layout of the buttons and text to the way the client wants it to look.
Modified Paths:
--------------
branches/2.4.2/config/templates/stageedit.xhtml
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2012-11-29 03:46:57 UTC (rev 484)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2012-11-30 00:20:31 UTC (rev 485)
@@ -148,19 +148,18 @@
<input type="hidden" name="action" value=""></input>
<table>
<tr>
-
<td style="width:0%;"><input type="button" onclick="embedsMessage();" value="Save stage "></input></td>
- <td style="width:0%;" ><input type="button" onclick="warn(1);" value="Clear screen changes "></input></td>
- <td style="width:0%;"><input type="button" onclick="warn(5);" value="Delete stage"></input></td>
+ <td style="width:0%;"><input type="button" onclick="saveStage(0);" value="Save and reload stage"></input></td>
+ <td colspan="3" style="width:50%;"><span id="warning">Warning: This will cause the stage to reload for everyone currently on it, and you will lose the chat log.</span></td>
</tr>
- <tr>
+ <tr>
+ <td style="width:0%;"><input type="button" onclick="warn(5);" value="Delete"></input></td>
+ <td style="width:0%;" ><input type="button" onclick="warn(1);" value="Revert changes "></input></td>
<td style="width:0%;"><input type="button" onclick="warn(3);" value="Clear stage"></input></td>
- <td style="width:50%;">Resets text chat, drawing's, colours and media on the stage.</td>
+ <td style="width:50%;">Clears the text chat and drawing layers.</td>
</tr>
<tr>
- <td style="width:0%;"><input type="button" onclick="saveStage(0);" value="Save and reload stage"></input></td>
- <td colspan="3" style="width:50%;"><span id="warning">Warning: This will cause the stage to reload for everyone currently on it, and you will lose the chat log.</span></td>
- </tr>
+ </tr>
</table>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-29 03:47:05
|
Revision: 484
http://upstage.svn.sourceforge.net/upstage/?rev=484&view=rev
Author: aut-upstage
Date: 2012-11-29 03:46:57 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Gavin
- Changed RSynth back to default method
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-29 01:35:27 UTC (rev 483)
+++ branches/2.4.2/upstage/voices.py 2012-11-29 03:46:57 UTC (rev 484)
@@ -81,8 +81,9 @@
exe = find_executable('rsynth-say')
if not exe:
return None
- s = ''.join((echo_in, timeout, exe, " -k27 ", options,
- " -v ", voice, " --stdin -w $1.wav ", log))
+ s = ''.join((echo_in, timeout, exe, " -a -l ", options,
+ " - ", log, rsynth_lame, log
+ ))
return [s]
def _espeak(voice, options=''):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-29 01:35:34
|
Revision: 483
http://upstage.svn.sourceforge.net/upstage/?rev=483&view=rev
Author: aut-upstage
Date: 2012-11-29 01:35:27 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Scott Riddell & Gavin Chan
--------
Mbrola voices installation Attempt 2
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-29 00:39:35 UTC (rev 482)
+++ branches/2.4.2/upstage/voices.py 2012-11-29 01:35:27 UTC (rev 483)
@@ -103,8 +103,8 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " /usr/local/share/mbrola/", mbvoice,
- " - $1.wav ", log))
+ mbrola, " -e ", mboptions, " " + "/usr/local/share/mbrola", mbvoice,
+ " - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-29 00:39:44
|
Revision: 482
http://upstage.svn.sourceforge.net/upstage/?rev=482&view=rev
Author: aut-upstage
Date: 2012-11-29 00:39:35 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Scott Riddell & Gavin Chan
--------
Mbrola voices installation Attempt 1
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-29 00:18:13 UTC (rev 481)
+++ branches/2.4.2/upstage/voices.py 2012-11-29 00:39:35 UTC (rev 482)
@@ -47,14 +47,15 @@
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
+espeak_mbrola_lame = " | %s lame -S --quiet -x -m m -s 16 --resample 22.05 --preset phone - $1" % timeout
+
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
espeak_lame = " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
espeak_cleanup = " rm $1.wav "
#Heath Behrens - Need to declare to possible paths for mbrola voices.
-path_to_embrola = "/usr/local/share/mbrola/"
+path_to_embrola = "/usr/local/share/mbrola"
#Heath Behrens - this is the path to some of the voices that install in a different location.
#The other option is to simply copy all voices from the folder to the previous folder.
path_to_embrola_alt = "/usr/local/share/mbrola/voices"
@@ -102,8 +103,8 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice,
- " - $1.wav ", log))
+ " | ", mbrola, " -e ", mboptions, " /usr/local/share/mbrola/", mbvoice,
+ " - $1.wav ", log))
return [s, espeak_mbrola_lame, espeak_cleanup]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-29 00:18:19
|
Revision: 481
http://upstage.svn.sourceforge.net/upstage/?rev=481&view=rev
Author: aut-upstage
Date: 2012-11-29 00:18:13 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Scott Riddell & Gavin Chan
--------
Added version history to voices.py
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-29 00:05:48 UTC (rev 480)
+++ branches/2.4.2/upstage/voices.py 2012-11-29 00:18:13 UTC (rev 481)
@@ -8,14 +8,16 @@
Modified: Shaun Narayan (01/27/10) - Static Voices Bug Fix (Aut Upstage team 09/10)
- Modified to allow finding enhanced festival2 voices
- Added new voices (some are just re-sampled existing voices)
- Heath Behrens & Vibhu Patel (15-06-2011) - Added some new voices namely emb_de6, emb_it4,emb_ro1,emb_gr2. More to come.
+Heath Behrens & Vibhu Patel (15-06-2011) - Added some new voices namely emb_de6, emb_it4,emb_ro1,emb_gr2. More to come.
Note the voice packages need to be installed, for the emb voices to work the packages:
mbrola-* need to be installed using either debian package manager or by extracting the
files to /usr/share/mbrola/
- Heath Behrens (18/09/2011) - Patch for emb voices, namely the emb voices which did not work on the main
+Heath Behrens (18/09/2011) - Patch for emb voices, namely the emb voices which did not work on the main
server. Modified _espeak_mbrola function.
- Daniel Han (12/10/2011) - Patch for cmu Voices which failed to create proper MP3 but only with noises. modified festival related methods
+Daniel Han (12/10/2011) - Patch for cmu Voices which failed to create proper MP3 but only with noises. modified festival related methods
+Gavin Chan and Scott Riddell (23/10/2011) - Changed raw to wav, updated _festival and _festival 2 methods to correctly configure the files into the right voice format
+Gavin Chan and Scott Riddell (29/10/2011) - Changed the mbrola path to the correct location, edited Rsynth method to work correctly.
"""
import re, os
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-29 00:05:57
|
Revision: 480
http://upstage.svn.sourceforge.net/upstage/?rev=480&view=rev
Author: aut-upstage
Date: 2012-11-29 00:05:48 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Gavin/Scott
Changed mbrola path in voices.py
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 03:15:36 UTC (rev 479)
+++ branches/2.4.2/upstage/voices.py 2012-11-29 00:05:48 UTC (rev 480)
@@ -52,10 +52,10 @@
espeak_cleanup = " rm $1.wav "
#Heath Behrens - Need to declare to possible paths for mbrola voices.
-path_to_embrola = "/usr/share/mbrola/"
+path_to_embrola = "/usr/local/share/mbrola/"
#Heath Behrens - this is the path to some of the voices that install in a different location.
#The other option is to simply copy all voices from the folder to the previous folder.
-path_to_embrola_alt = "/usr/share/mbrola/voices"
+path_to_embrola_alt = "/usr/local/share/mbrola/voices"
text2wave = '/usr/local/share/festvox/festival/bin/text2wave'
@@ -78,9 +78,8 @@
exe = find_executable('rsynth-say')
if not exe:
return None
- s = ''.join((echo_in, timeout, exe, " -a -l ", options,
- " - ", log, rsynth_lame, log
- ))
+ s = ''.join((echo_in, timeout, exe, " -k27 ", options,
+ " -v ", voice, " --stdin -w $1.wav ", log))
return [s]
def _espeak(voice, options=''):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 03:15:47
|
Revision: 479
http://upstage.svn.sourceforge.net/upstage/?rev=479&view=rev
Author: aut-upstage
Date: 2012-11-23 03:15:36 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 17
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 02:47:51 UTC (rev 478)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 03:15:36 UTC (rev 479)
@@ -43,9 +43,9 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
-rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
+fest_lame = " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
+rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
+espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
# espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
espeak_lame = " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
@@ -101,9 +101,9 @@
if not espeak or not mbrola:
return None
s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
- " | ", mbrola, " -e ", mboptions, " /usr/share/mbrola/", mbvoice,
- " - $1.wav ", log))
-return [s, espeak_mbrola_lame, espeak_cleanup]
+ " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice,
+ " - $1.wav ", log))
+ return [s, espeak_mbrola_lame, espeak_cleanup]
#XXX perhaps ought to be moved OUT of python code into a real config file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 02:47:57
|
Revision: 478
http://upstage.svn.sourceforge.net/upstage/?rev=478&view=rev
Author: aut-upstage
Date: 2012-11-23 02:47:51 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 16
Modified Paths:
--------------
branches/2.4.2/upstage/voices.py
Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py 2012-11-23 02:40:48 UTC (rev 477)
+++ branches/2.4.2/upstage/voices.py 2012-11-23 02:47:51 UTC (rev 478)
@@ -43,7 +43,7 @@
echo_in = ''#cat | ' #"read SPEECH ; echo $SPEECH |"
#Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
-fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 11.05 --preset phone - $1 " % timeout
+fest_lame = " | %s lame -S --quiet -m s -r -s %%s --resample 22.05 --preset phone - $1 " % timeout
rsynth_lame = " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
espeak_mbrola_lame = " %s lame -S --quiet -m m -s 16 --resample 22.05 --preset phone $1.wav $1" % timeout
@@ -64,7 +64,7 @@
def _festival(voice, hz):
s = ''.join((echo_in, timeout, "text2wave -eval '%s' " % voice,
- " -otyp wav - -o - ", log,
+ " -otype wav - -o - ", log,
(fest_lame % hz), log))
return [s]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-11-23 02:41:01
|
Revision: 477
http://upstage.svn.sourceforge.net/upstage/?rev=477&view=rev
Author: aut-upstage
Date: 2012-11-23 02:40:48 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Scott & Gavin
------
voices.py fix attempt 15
Modified Paths:
--------------
branches/2.4.2/config/voices/awb_cmu.sh
branches/2.4.2/config/voices/awb_cmu_faster.sh
branches/2.4.2/config/voices/awb_nitech.sh
branches/2.4.2/config/voices/awb_nitech_faster.sh
branches/2.4.2/config/voices/bdl_cmu.sh
branches/2.4.2/config/voices/bdl_cmu_faster.sh
branches/2.4.2/config/voices/bdl_nitech.sh
branches/2.4.2/config/voices/bdl_nitech_faster.sh
branches/2.4.2/config/voices/bud.sh
branches/2.4.2/config/voices/clb_nitech.sh
branches/2.4.2/config/voices/clb_nitech_faster.sh
branches/2.4.2/config/voices/default.sh
branches/2.4.2/config/voices/don.sh
branches/2.4.2/config/voices/jmk_cmu.sh
branches/2.4.2/config/voices/jmk_cmu_faster.sh
branches/2.4.2/config/voices/jmk_nitech.sh
branches/2.4.2/config/voices/jmk_nitech_faster.sh
branches/2.4.2/config/voices/kal.sh
branches/2.4.2/config/voices/kal_cmu.sh
branches/2.4.2/config/voices/kal_cmu_faster.sh
branches/2.4.2/config/voices/ked.sh
branches/2.4.2/config/voices/ksp_cmu.sh
branches/2.4.2/config/voices/ksp_cmu_faster.sh
branches/2.4.2/config/voices/rab.sh
branches/2.4.2/config/voices/randy.sh
branches/2.4.2/config/voices/rms_cmu.sh
branches/2.4.2/config/voices/rms_cmu_faster.sh
branches/2.4.2/config/voices/rms_faster.sh
branches/2.4.2/config/voices/rms_nitech.sh
branches/2.4.2/config/voices/roger.sh
branches/2.4.2/config/voices/slt_cmu.sh
branches/2.4.2/config/voices/slt_cmu_faster.sh
branches/2.4.2/config/voices/slt_nitech.sh
branches/2.4.2/config/voices/slt_nitech_faster.sh
Modified: branches/2.4.2/config/voices/awb_cmu.sh
===================================================================
--- branches/2.4.2/config/voices/awb_cmu.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/awb_cmu.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_awb_arctic_clunits)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_awb_arctic_clunits)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/awb_cmu_faster.sh
===================================================================
--- branches/2.4.2/config/voices/awb_cmu_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/awb_cmu_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_awb_arctic_clunits)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_awb_arctic_clunits)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/awb_nitech.sh
===================================================================
--- branches/2.4.2/config/voices/awb_nitech.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/awb_nitech.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_awb_arctic_hts)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_awb_arctic_hts)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/awb_nitech_faster.sh
===================================================================
--- branches/2.4.2/config/voices/awb_nitech_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/awb_nitech_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_awb_arctic_hts)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_awb_arctic_hts)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/bdl_cmu.sh
===================================================================
--- branches/2.4.2/config/voices/bdl_cmu.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/bdl_cmu.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_bdl_arctic_clunits)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_bdl_arctic_clunits)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/bdl_cmu_faster.sh
===================================================================
--- branches/2.4.2/config/voices/bdl_cmu_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/bdl_cmu_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_bdl_arctic_clunits)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_bdl_arctic_clunits)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/bdl_nitech.sh
===================================================================
--- branches/2.4.2/config/voices/bdl_nitech.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/bdl_nitech.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_bdl_arctic_hts)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_bdl_arctic_hts)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/bdl_nitech_faster.sh
===================================================================
--- branches/2.4.2/config/voices/bdl_nitech_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/bdl_nitech_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_bdl_arctic_hts)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_bdl_arctic_hts)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/bud.sh
===================================================================
--- branches/2.4.2/config/voices/bud.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/bud.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_us2_mbrola)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_us2_mbrola)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/clb_nitech.sh
===================================================================
--- branches/2.4.2/config/voices/clb_nitech.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/clb_nitech.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_clb_arctic_hts)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_clb_arctic_hts)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/clb_nitech_faster.sh
===================================================================
--- branches/2.4.2/config/voices/clb_nitech_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/clb_nitech_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_clb_arctic_hts)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_clb_arctic_hts)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/default.sh
===================================================================
--- branches/2.4.2/config/voices/default.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/default.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_us1_mbrola)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_us1_mbrola)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/don.sh
===================================================================
--- branches/2.4.2/config/voices/don.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/don.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_don_diphone)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 5 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_don_diphone)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 5 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/jmk_cmu.sh
===================================================================
--- branches/2.4.2/config/voices/jmk_cmu.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/jmk_cmu.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_jmk_arctic_clunits)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_jmk_arctic_clunits)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/jmk_cmu_faster.sh
===================================================================
--- branches/2.4.2/config/voices/jmk_cmu_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/jmk_cmu_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_jmk_arctic_clunits)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_jmk_arctic_clunits)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/jmk_nitech.sh
===================================================================
--- branches/2.4.2/config/voices/jmk_nitech.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/jmk_nitech.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_jmk_arctic_hts)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_jmk_arctic_hts)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/jmk_nitech_faster.sh
===================================================================
--- branches/2.4.2/config/voices/jmk_nitech_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/jmk_nitech_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_jmk_arctic_hts)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_jmk_arctic_hts)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/kal.sh
===================================================================
--- branches/2.4.2/config/voices/kal.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/kal.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_kal_diphone)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_kal_diphone)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/kal_cmu.sh
===================================================================
--- branches/2.4.2/config/voices/kal_cmu.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/kal_cmu.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_kal_com_clunits)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_kal_com_clunits)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/kal_cmu_faster.sh
===================================================================
--- branches/2.4.2/config/voices/kal_cmu_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/kal_cmu_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_kal_com_clunits)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_kal_com_clunits)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/ked.sh
===================================================================
--- branches/2.4.2/config/voices/ked.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/ked.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_ked_diphone)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_ked_diphone)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/ksp_cmu.sh
===================================================================
--- branches/2.4.2/config/voices/ksp_cmu.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/ksp_cmu.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_ksp_arctic_clunits)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_ksp_arctic_clunits)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/ksp_cmu_faster.sh
===================================================================
--- branches/2.4.2/config/voices/ksp_cmu_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/ksp_cmu_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_ksp_arctic_clunits)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_ksp_arctic_clunits)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/rab.sh
===================================================================
--- branches/2.4.2/config/voices/rab.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/rab.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_rab_diphone)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_rab_diphone)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/randy.sh
===================================================================
--- branches/2.4.2/config/voices/randy.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/randy.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_us3_mbrola)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_us3_mbrola)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/rms_cmu.sh
===================================================================
--- branches/2.4.2/config/voices/rms_cmu.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/rms_cmu.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_rms_arctic_clunits)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_rms_arctic_clunits)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/rms_cmu_faster.sh
===================================================================
--- branches/2.4.2/config/voices/rms_cmu_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/rms_cmu_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_rms_arctic_clunits)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_rms_arctic_clunits)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/rms_faster.sh
===================================================================
--- branches/2.4.2/config/voices/rms_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/rms_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_rms_arctic_hts)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_rms_arctic_hts)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/rms_nitech.sh
===================================================================
--- branches/2.4.2/config/voices/rms_nitech.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/rms_nitech.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_rms_arctic_hts)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_rms_arctic_hts)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/roger.sh
===================================================================
--- branches/2.4.2/config/voices/roger.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/roger.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_en1_mbrola)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_en1_mbrola)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/slt_cmu.sh
===================================================================
--- branches/2.4.2/config/voices/slt_cmu.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/slt_cmu.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_slt_arctic_clunits)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_slt_arctic_clunits)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/slt_cmu_faster.sh
===================================================================
--- branches/2.4.2/config/voices/slt_cmu_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/slt_cmu_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_slt_arctic_clunits)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_cmu_us_slt_arctic_clunits)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/slt_nitech.sh
===================================================================
--- branches/2.4.2/config/voices/slt_nitech.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/slt_nitech.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_slt_arctic_hts)' -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_slt_arctic_hts)' -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
Modified: branches/2.4.2/config/voices/slt_nitech_faster.sh
===================================================================
--- branches/2.4.2/config/voices/slt_nitech_faster.sh 2012-11-23 02:35:21 UTC (rev 476)
+++ branches/2.4.2/config/voices/slt_nitech_faster.sh 2012-11-23 02:40:48 UTC (rev 477)
@@ -1,3 +1,3 @@
#!/bin/sh
#automatically generated. think before editing.
- /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_slt_arctic_hts)' -F 11025 -otype raw - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -r -s 8 --resample 22.05 - $1
\ No newline at end of file
+ /usr/bin/timeout 15 text2wave -eval '(voice_nitech_us_slt_arctic_hts)' -F 11025 -otype wav - -o - | /usr/bin/timeout 15 lame -S --quiet -m s -s 8 --resample 22.05 - $1
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
