More code changes. This is a big mess right now. Will clean this up.

src/controller/buffersController.py

@@ -448,6 +448,7 @@ class baseBufferController(bufferController):
     url=urls_list.get_string()
    if hasattr(urls_list, "destroy"): urls_list.destroy()
   if url != None:
+   sound.URLPlayer.stop_audio()
    if sound.URLPlayer.is_playable(url=url,play=True) == False:
     return self.url(url)
   elif utils.is_geocoded(tweet):

src/sound.py

@@ -155,6 +155,7 @@ class URLStream(object):
    return False
  def stop_audio(self):
   if hasattr(self, "stream") and self.stream.is_playing == True:
+   output.speak("Stopped.",True)
    self.stream.stop()
 
  @staticmethod

src/twitter/utils.py

@@ -45,7 +45,6 @@ def find_next_reply(id, listItem):
  return None
 
 def is_audio(tweet,force=False):
-<<<<<<< HEAD
  start=time.time()
  if force == False and 'is_audio' in tweet:
   return tweet['is_audio']
@@ -143,7 +142,6 @@ def is_allowed(tweet, clients):
    allowed = False
    log.exception("Tuit not allowed: %s" % (tweet["text"],))
  return allowed
-<<<<<<< HEAD
 
 def url_is_audio(u):
  sound.URLPlayer.is_playable(u)