Fixed desktop file, added some logging

diff --git a/data/jamaendo.desktop b/data/jamaendo.desktop
index 6412eaa..deaa4ef 100644 (file)
--- a/data/jamaendo.desktop
+++ b/data/jamaendo.desktop
@@ -7,8 +7,4 @@ Icon=jamaendo
 Terminal=false
 Type=Application
 Categories=Audio;GTK;
 Terminal=false
 Type=Application
 Categories=Audio;GTK;

-StartupWMClass=jamaendo
-StartupNotify=true
-X-Osso-Type=application/x-executable
-X-Osso-Service=org.jamaendo
-X-HildonDesk-ShowInToolbar=true
\ No newline at end of file
+X-HildonDesk-ShowInToolbar=true

diff --git a/jamaui/player.py b/jamaui/player.py
index ec3c75b..3065b10 100644 (file)
--- a/jamaui/player.py
+++ b/jamaui/player.py
@@ -175,6 +175,7 @@ class GStreamer(_Player):
 
         if self.volume_control is not None:
             vol = value * float(self.volume_multiplier)
 
         if self.volume_control is not None:
             vol = value * float(self.volume_multiplier)

+            log.debug("Setting volume to %s", vol)

             self.volume_control.set_property( self.volume_property, vol )
 
     def _set_uri_to_be_played(self, uri):
             self.volume_control.set_property( self.volume_property, vol )
 
     def _set_uri_to_be_played(self, uri):

diff --git a/jamaui/playerwindow.py b/jamaui/playerwindow.py
index f7fe5b3..a017057 100644 (file)
--- a/jamaui/playerwindow.py
+++ b/jamaui/playerwindow.py
@@ -27,6 +27,9 @@ import hildon
 from settings import settings
 from postoffice import postoffice
 from player import Playlist, the_player
 from settings import settings
 from postoffice import postoffice
 from player import Playlist, the_player

+import logging
+
+log = logging.getLogger(__name__)

 
 class PlayerWindow(hildon.StackableWindow):
     def __init__(self, playlist=None):
 
 class PlayerWindow(hildon.StackableWindow):
     def __init__(self, playlist=None):

@@ -132,7 +135,9 @@ class PlayerWindow(hildon.StackableWindow):
 
     def on_position_timeout(self):
         if the_player.playing():
 
     def on_position_timeout(self):
         if the_player.playing():

-            self.set_position(*the_player.get_position_duration())
+            self.set_song_position(*the_player.get_position_duration())
+        else:
+            log.debug("position timeout, but not playing")

         return True
 
     def start_position_timer(self):
         return True
 
     def start_position_timer(self):

@@ -148,7 +153,7 @@ class PlayerWindow(hildon.StackableWindow):
     def clear_position(self):
         self.progress.set_value(0)
 
     def clear_position(self):
         self.progress.set_value(0)
 

-    def set_position(self, time_elapsed, total_time):
+    def set_song_position(self, time_elapsed, total_time):

         value = (float(time_elapsed) / float(total_time)) if total_time else 0
         self.progress.set_value( value )
 
         value = (float(time_elapsed) / float(total_time)) if total_time else 0
         self.progress.set_value( value )
 

diff --git a/jamaui/ui.py b/jamaui/ui.py
index 8fc1997..8b39275 100644 (file)
--- a/jamaui/ui.py
+++ b/jamaui/ui.py
@@ -80,12 +80,13 @@ class Jamaui(object):
         self.window = None
 
     def create_window(self):
         self.window = None
 
     def create_window(self):

+        log.debug("Creating main window...")

         self.app = hildon.Program()
         self.window = hildon.StackableWindow()
         self.app.add_window(self.window)
 
         self.window.set_title("jamaendo")
         self.app = hildon.Program()
         self.window = hildon.StackableWindow()
         self.app.add_window(self.window)
 
         self.window.set_title("jamaendo")

-        self.window.set_icon('jamaendo')
+

         self.window.connect("destroy", self.destroy)
 
         self.CONFDIR = os.path.expanduser('~/MyDocs/.jamaendo')
         self.window.connect("destroy", self.destroy)
 
         self.CONFDIR = os.path.expanduser('~/MyDocs/.jamaendo')

@@ -94,6 +95,7 @@ class Jamaui(object):
         settings.load()
 
         postoffice.connect('request-album-cover', self.on_request_cover)
         settings.load()
 
         postoffice.connect('request-album-cover', self.on_request_cover)

+        log.debug("Created main window.")

 
     def save_settings(self):
         settings.save()
 
     def save_settings(self):
         settings.save()