From cffbaf0a8da70902cc9e354fe38a22b8406e14d9 Mon Sep 17 00:00:00 2001
From: mikeycgto <mikeycgto@gmail.com>
Date: Thu, 8 Sep 2011 13:22:53 -0400
Subject: [PATCH] change module name to avoid conflicts

---
 bin/spotify-dbus    | 5 +++--
 lib/spotify-dbus.rb | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/spotify-dbus b/bin/spotify-dbus
index 245dc5a..6ee1136 100755
--- a/bin/spotify-dbus
+++ b/bin/spotify-dbus
@@ -9,9 +9,10 @@ end
 if ARGV.size > 0
   begin
     cmd = ARGV.pop
+    player = SpotifyDBus.player
     
-    if Spotify.player.methods[cmd]
-      Spotify.player.send(cmd)
+    if player.methods[cmd]
+      player.send(cmd)
       
     else
       die "Invalid command!"
diff --git a/lib/spotify-dbus.rb b/lib/spotify-dbus.rb
index 6d13f7a..ee743df 100644
--- a/lib/spotify-dbus.rb
+++ b/lib/spotify-dbus.rb
@@ -1,6 +1,6 @@
 require 'dbus'
 
-module Spotify
+module SpotifyDBus
   def self.player
     @player ||= find_dbus_object
   end