diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-31 23:08:05 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-31 23:08:05 (GMT) |
commit | a732aef47e56739224e8c1fd54f644c58c16b9d5 (patch) | |
tree | 75aac3eda1679673c34d0f9f4b1b6974362b28fe | |
parent | 4b5c16eb89ca81730777712a85ffe1b4e6055ca2 (diff) | |
parent | 5c029f2afa3fc067183d36ab361fd9d61bc34971 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/memorygame
-rwxr-xr-x | memosono.py | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/memosono.py b/memosono.py index 67b21a0..8f29c1e 100755 --- a/memosono.py +++ b/memosono.py @@ -427,13 +427,13 @@ class View: #self.ebresult.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("red")) return False - def _delete_event(self, event, data=None): - controler.cssock.send("off()") - controler.cssock.close() - if controler.child.fromchild is not None: - controler.child.fromchild.close() + #def _delete_event(self, event, controler): + # controler.cssock.send("off()") + # controler.cssock.close() + # if controler.child.fromchild is not None: + # controler.child.fromchild.close() #gtk.main_quit() - return False + #return False def read_config(filename, seed, numelems): @@ -535,7 +535,7 @@ class MemosonoActivity(Activity): self.controler = Controler(_MEMO) self.model = Model(grid) self.view = View(self.controler, self, _MEMO) - self.connect('destroy', self.view._delete_event) + #self.connect('destroy', self.view._delete_event) # SLOTS connections: self.model.connect('tileflipped', self.controler._tile_flipped) @@ -556,18 +556,15 @@ class MemosonoActivity(Activity): while(i < _MEMO['_NUM_GRIDPOINTS']): self.view.buttonObj[i].connect('clicked', self.controler._user_input, i) i+=1 - - #try: - # gtk.main() - #except KeyboardInterrupt: - # close socket to csound server - # if controler.cssock is not None: - # controler.cssock.send("off()") - # controler.cssock.close() - # if controler.child.fromchild is not None: - # controler.child.fromchild.close() - # print 'Ctrl+C pressed, exiting...' - def _cleanup_cb(self): + def _cleanup_cb(self, data=None): self.controler.oscapi.ioSocket.close() self.server.oscapi.ioSocket.close() + logging.debug(" Closed OSC sockets ") + if self.controler.cssock is not None: + self.controler.cssock.send("off()") + self.controler.cssock.close() + logging.debug(" Sent off signal to server ") + if self.controler.child.fromchild is not None: + self.controler.child.fromchild.close() + logging.debug(" Closed the server app. ") |