gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-04-18 10:59:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Creating two functions from duplicated code"

Browse Source 
This reverts commit 59b4cefd53.

Conflicts:
headphones/postprocessor.py

Reverting PP changes
This commit is contained in:
Ade
2014-08-28 18:12:24 +12:00
parent 3d22a66701
commit 701f709c23
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headphones/postprocessor.py
View File

@@ -30,6 +30,7 @@ from headphones import logger, helpers, request, mb, music_encoder
postprocessor_lock = threading.Lock()
<<<<<<< HEAD
def find_in_path(albumpath, extra_formats=None, use_MF=True):
""" Takes a path and optionally extra formats.
@@ -73,6 +74,8 @@ def count_matches(track_list, match, inverted=False):
return nr_of_matches, new_list
=======
>>>>>>> parent of 59b4cef... Creating two functions from duplicated code
def checkFolder():
with postprocessor_lock: