Changeset 496

Show
Ignore:
Timestamp:
11/24/06 20:23:45 (2 years ago)
Author:
nicfit
Message:

More stuff

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/mesk/audio/__init__.py

    r495 r496  
    9090        # If this is a URL, let things be... 
    9191        import source 
    92         src = source.AudioSource(uri
     92        src = source.AudioSource(uri, source.AudioMetaData()
    9393    else: 
    9494        factory = supported_mimetypes[mt] 
  • trunk/src/status_bar.py

    r494 r496  
    2020 
    2121class StatusBar(object): 
     22    (STATUS_LEFT, STATUS_RIGHT) = range(2) 
     23 
    2224    def __init__(self, xml): 
    2325        self.xml = xml 
    2426        self._status_hbox = self.xml.get_widget('status_bar') 
    25         self._status_label_left = self.xml.get_widget('status_bar_label1') 
    26         self._status_label_right = self.xml.get_widget('status_bar_label2') 
     27        self._status_labels = {} 
     28        self._status_labels[self.STATUS_LEFT] = \ 
     29            self.xml.get_widget('status_bar_label1') 
     30        self._status_labels[self.STATUS_RIGHT] = \ 
     31            self.xml.get_widget('status_bar_label2') 
    2732        self._status_image = self.xml.get_widget('status_bar_img') 
    2833 
     
    3035 
    3136    def clear(self): 
    32         self._status_label_left.set_text('') 
    33         self._status_label_right.set_text('') 
     37        for label in self._status_labels.values(): 
     38            label.set_text('') 
    3439        self._status_image.hide() 
     40 
     41    def set_status(self, msg, which=STATUS_LEFT): 
     42        self._status_labels[which].set_text(msg) 
    3543 
    3644    def hide(self):