Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam

Conflicts:

	GUI/Core/MainWindow.py
	TamTam.py

1 files changed, 15 insertions, 1 deletions

diff --git a/TamTam.py b/TamTam.py
index 3b11382..b77d4d8 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -15,6 +15,8 @@ import time
 from GUI.StandalonePlayer import StandAlonePlayer
 from GUI.Core.MainWindow import MainWindow
 
+from Framework.Core.Profiler import TP
+
 if __name__ == "__main__": 
     def run_sugar_mode():
         CSoundClient.initialize(True)
@@ -22,7 +24,7 @@ if __name__ == "__main__":
         tamtam = StandAlonePlayer()
         #tamtam = gtk.Button("adsf")
         mainwin = gtk.Window(gtk.WINDOW_TOPLEVEL)
-        mainwin.set_size_request(1200,600)
+        #mainwin.set_size_request(1200,600)
         mainwin.set_title('miniTamTam')
         mainwin.set_resizable(False)
         mainwin.connect('destroy' , gtk.main_quit )
@@ -36,9 +38,16 @@ if __name__ == "__main__":
         sys.exit(0)
 
     def run_edit_mode():
+        TP.Profile("TT::init")
+        TP.Profile("TT::init::csound")
         CSoundClient.initialize(True)
         CSoundClient.setMasterVolume(100)
+        TP.Profile("TT::init::csound")
+        TP.Profile("TT::init::mainwin")
+        TP.Profile("TT::init::mainwin::init")
         tamtam = MainWindow()
+        TP.Profile("TT::init::mainwin::init")
+        TP.Profile("TT::init::mainwin::connect")
         mainwin = gtk.Window(gtk.WINDOW_TOPLEVEL)
         mainwin.set_title('TamTam Player')
         mainwin.set_geometry_hints( None, 1200, 900, 1200, 900, 1200, 900 )
@@ -50,8 +59,13 @@ if __name__ == "__main__":
         mainwin.connect( "key-release-event", tamtam.onKeyRelease )
         mainwin.connect( "delete_event", tamtam.delete_event )
         mainwin.add(tamtam)
+        TP.Profile("TT::init::mainwin::add")
+        TP.Profile("TT::init::mainwin")
+        TP.Profile("TT::init::show")
         tamtam.show()
         mainwin.show()
+        TP.Profile("TT::init::show")
+        TP.Profile("TT::init")
         gtk.main()
         CSoundClient.initialize(False)
         sys.exit(0)