diff --git a/libsaria/__init__.py b/libsaria/__init__.py index 85f63c05..e9a6b14b 100644 --- a/libsaria/__init__.py +++ b/libsaria/__init__.py @@ -1,6 +1,6 @@ # Bryan Schumaker (8/7/2010) -__all__ = [ "collection", "music", +__all__ = [ "collection", "audio", "data", "event", "map", "path", "plugin"] __major__ = 1 @@ -22,7 +22,7 @@ prefs = None cache = Cache() plugin = None -music = None +audio = None lastfm = None @@ -30,12 +30,12 @@ lastfm = None def init(): global vars global prefs - global music + global audio global lastfm vars = Map() prefs = Map("preferences") - import music + import audio import lastfm event.start("POSTINIT") @@ -58,7 +58,7 @@ def startup(): import plugin event.start("PRESTART") - music.init() + audio.init() plugin.load_all() event.start("POSTSTART") diff --git a/libsaria/music/__init__.py b/libsaria/audio/__init__.py similarity index 100% rename from libsaria/music/__init__.py rename to libsaria/audio/__init__.py diff --git a/libsaria/music/audio.py b/libsaria/audio/audio.py similarity index 100% rename from libsaria/music/audio.py rename to libsaria/audio/audio.py diff --git a/libsaria/collection/__init__.py b/libsaria/collection/__init__.py index f4a69849..c7d3ca02 100644 --- a/libsaria/collection/__init__.py +++ b/libsaria/collection/__init__.py @@ -58,7 +58,7 @@ def choose_next(): return call("NEXT", play_id, next) def change_score(): - prcnt = libsaria.music.get_progress() + prcnt = libsaria.audio.get_progress() if prcnt > 0.75: inc_count(cur_lib_id) inc_score(cur_lib_id) diff --git a/libsaria/collection/library.py b/libsaria/collection/library.py index 41883830..66a15970 100644 --- a/libsaria/collection/library.py +++ b/libsaria/collection/library.py @@ -103,8 +103,8 @@ def inc_count(id): def play_id(id): libsaria.collection.cur_lib_id = id filepath = get_attr(id, "filepath") - libsaria.music.load(filepath) - libsaria.music.play() + libsaria.audio.load(filepath) + libsaria.audio.play() def filter(text): global visible diff --git a/libsaria/data.py b/libsaria/data.py index aa908d9b..8f766a43 100644 --- a/libsaria/data.py +++ b/libsaria/data.py @@ -58,7 +58,7 @@ def universal_open(file): if id: libsaria.collection.play_id(id) else: - libsaria.music.load(file) + libsaria.audio.load(file) except Exception,e: print e pass diff --git a/ocarina/button.py b/ocarina/button.py index 18a6a5cc..4a5717a5 100644 --- a/ocarina/button.py +++ b/ocarina/button.py @@ -37,7 +37,7 @@ class PlayButton(Button): LS.event.invite("POSTPAUSE", self.show) LS.event.invite("POSTSTOP", self.show) def clicked(self, button): - LS.music.play() + LS.audio.play() def hide(self, playing): if playing == True: Button.hide(self) @@ -52,7 +52,7 @@ class PauseButton(Button): LS.event.invite("POSTPAUSE", self.hide) LS.event.invite("POSTSTOP", self.hide) def clicked(self, button): - LS.music.pause() + LS.audio.pause() def hide(self, paused): if paused == True: Button.hide(self) @@ -65,7 +65,7 @@ class StopButton(Button): def __init__(self): Button.__init__(self, gtk.STOCK_MEDIA_STOP) def clicked(self, button): - LS.music.stop() + LS.audio.stop() class NextButton(Button): @@ -79,14 +79,14 @@ class ForwardButton(Button): def __init__(self): Button.__init__(self, gtk.STOCK_MEDIA_FORWARD) def clicked(self, button): - LS.music.seek_sec(5) + LS.audio.seek_sec(5) class RewindButton(Button): def __init__(self): Button.__init__(self, gtk.STOCK_MEDIA_REWIND) def clicked(self, button): - LS.music.seek_sec(-5) + LS.audio.seek_sec(-5) class OpenButton(Button): def __init__(self): @@ -154,5 +154,5 @@ class VolumeButton(gtk.VolumeButton): image.set_from_icon_name(icon, gtk.ICON_SIZE_BUTTON) def changed(self, widget, value): - LS.music.set_volume(value) + LS.audio.set_volume(value) widget.resize() diff --git a/ocarina/label.py b/ocarina/label.py index e234aa5e..1dc13593 100644 --- a/ocarina/label.py +++ b/ocarina/label.py @@ -16,8 +16,8 @@ def set_fns(): global get_time global get_attr global file_to_id - #update = ocarina.libsaria.music.get_progress - get_time = ocarina.libsaria.music.get_time + #update = ocarina.libsaria.audio.get_progress + get_time = ocarina.libsaria.audio.get_time get_attr = libsaria.collection.get_attr file_to_id = libsaria.collection.file_to_id invite("POSTSTART", set_fns) diff --git a/ocarina/pbar.py b/ocarina/pbar.py index cb9f9445..beae473b 100644 --- a/ocarina/pbar.py +++ b/ocarina/pbar.py @@ -10,8 +10,8 @@ def set_fns(): global update global get_time global seek - update = ocarina.libsaria.music.get_progress - seek = ocarina.libsaria.music.seek + update = ocarina.libsaria.audio.get_progress + seek = ocarina.libsaria.audio.seek ocarina.libsaria.event.invite("POSTSTART", set_fns) diff --git a/plugins/pause_after.py b/plugins/pause_after.py index 1185597f..ddf6dd80 100644 --- a/plugins/pause_after.py +++ b/plugins/pause_after.py @@ -7,7 +7,7 @@ menu = ocarina.menu def check_pause(*args): if vars["PAUSEAFTER"] == True: - libsaria.music.pause() + libsaria.audio.pause() vars["PAUSEAFTER"] = False def set_pause(*args): diff --git a/plugins/web_radio.py b/plugins/web_radio.py index b12d00a1..bcda8b8f 100644 --- a/plugins/web_radio.py +++ b/plugins/web_radio.py @@ -2,7 +2,7 @@ import ocarina -music = ocarina.libsaria.music +audio = ocarina.libsaria.audio gtk = ocarina.gtk webkit = None @@ -26,7 +26,7 @@ class WebPage(gtk.ScrolledWindow): self.web.show() def doc_load_finished(self, view, webframe): - music.pause() + audio.pause() def start(): global webkit diff --git a/tests/audio.py b/tests/audio.py index 7cd52db1..651a7cb6 100644 --- a/tests/audio.py +++ b/tests/audio.py @@ -1,24 +1,24 @@ # Bryan Schumaker (8/7/2010) -from libsaria import music +from libsaria import audio path = "~/Music/Eagles/Hotel California.mp3" -music.load(path) +audio.load(path) raw_input("Press ENTER to play ... ") -music.play() +audio.play() raw_input("Press ENTER to pause ... ") -music.pause() +audio.pause() raw_input("Press ENTER to play ... ") -music.play() +audio.play() raw_input("Press ENTER to stop ... ") -music.stop() +audio.stop() raw_input("Press ENTER to play ... ") -music.play() +audio.play() raw_input("Press ENTER to quit ... ")