Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1. ENH: Remove Pyo for Pyglet, add Py3k support #112

Merged
merged 7 commits into from
Mar 31, 2014

Conversation

larsoner
Copy link
Member

Ready for review and merge.

@drammock
Copy link
Member

I think it is charitable to pyo that you call this ENH rather than FIX

On Wed, Mar 26, 2014 at 3:19 PM, Eric89GXL notifications@github.com wrote:

Examples work and tests pass. I just want to see if I can get 3.3

working...

You can merge this Pull Request by running

git pull https://github.com/Eric89GXL/expyfun play-sound

Or view, comment on, or merge it at:

#112
Commit Summary

  • ENH: Remove Pyo for Pyglet
  • FIX: Travis 3.3

File Changes

Patch Links:


Reply to this email directly or view it on GitHubhttps://github.com//pull/112
.

@larsoner larsoner changed the title WIP ENH: Remove Pyo for Pyglet WIP ENH: Remove Pyo for Pyglet, add 3.3 support Mar 26, 2014
@larsoner larsoner changed the title WIP ENH: Remove Pyo for Pyglet, add 3.3 support WIP ENH: Remove Pyo for Pyglet, add Py3k support Mar 26, 2014
@larsoner larsoner changed the title WIP ENH: Remove Pyo for Pyglet, add Py3k support 1. ENH: Remove Pyo for Pyglet, add Py3k support Mar 27, 2014
@larsoner
Copy link
Member Author

Tests now pass on Travis (although it's hitting some silly timeout unrelated to us ATM), and we have Py3k support (hooray!). I've actually now tested the code on my OSX machine, and it works there, too. This is ready for review.

Out of the open PRs, this should be reviewed and merged first -- I've updated the titles on my other open PRs to make it clearer the order they should be dealt with. (The other PRs will require some rebasing after this is merged.)

self.noise_array = np.array(np.c_[noise, -1.0 * noise], order='C')
self.noise = Sound(self.noise_array, loop=True)
self.noise_array = np.array((noise, -1.0 * noise))
self.noise = SoundPlayer(self.noise_array, self.fs, loop=True)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, when we create a SoundController object, the noise will start playing automatically? That seems like undesirable behavior for, e.g., training phases.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, self.noise.play() must be called

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case why do we set self._noise_playing = True as part of __init__ (in line 100 below)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below where _noise_playing is actually used. Need some way of storing the state so that, if a user sets the noise level, we know whether to play the new noise or not.

drammock added a commit that referenced this pull request Mar 31, 2014
1. ENH: Remove Pyo for Pyglet, add Py3k support.  Ready to rebase the other PRs, @Eric89GXL?
@drammock drammock merged commit b53f962 into LABSN:master Mar 31, 2014
@larsoner larsoner deleted the play-sound branch April 24, 2014 05:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants