summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2014-08-29 04:43:08 +0300
committerKai Huuhko <kai.huuhko@gmail.com>2014-08-29 04:43:08 +0300
commit8d46a4c99ed440eada03bc149c507778ab084e8c (patch)
treebfdba2e3a5f83eb6391ea8ce82aff7fd5c2e62bb
parent0ecb75fcf943a2a9bd1fb6a8a9d88f1046f56a55 (diff)
Remove emotion module name check
-rwxr-xr-xvalosoitin/Valosoitin.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/valosoitin/Valosoitin.py b/valosoitin/Valosoitin.py
index 0a1e4c6..ff024f9 100755
--- a/valosoitin/Valosoitin.py
+++ b/valosoitin/Valosoitin.py
@@ -27,10 +27,12 @@ import urllib
27import argparse 27import argparse
28import datetime 28import datetime
29import cgi 29import cgi
30
30try: 31try:
31 import ConfigParser 32 import ConfigParser
32except ImportError: 33except ImportError:
33 from configparser import ConfigParser 34 from configparser import ConfigParser
35
34try: 36try:
35 import cPickle 37 import cPickle
36except ImportError: 38except ImportError:
@@ -139,12 +141,6 @@ for section in ("Settings", "Last played"):
139 if not conf.has_section(section): 141 if not conf.has_section(section):
140 conf.add_section(section) 142 conf.add_section(section)
141 143
142try:
143 if not conf.get("Settings", "audio_backend") in ("gstreamer", "xine"):
144 log.error("Invalid audio backend in config file. Set it to either gstreamer or xine.")
145 sys.exit()
146except:
147 log.error("audio_backend was not found in settings file. Set it to a value or remove the settings file so that a new one will be generated at next start of this program.")
148 144
149class Valosoitin(object): 145class Valosoitin(object):
150 def __init__(self, *args): 146 def __init__(self, *args):