reorder filters

ffplayout/filters/default.py

@@ -23,7 +23,7 @@ import re
 from glob import glob
 from pydoc import locate
 
-from .utils import _global, _pre, _text
+from ffplayout.utils import _global, _pre, _text
 
 # ------------------------------------------------------------------------------
 # building filters,
@@ -250,13 +250,12 @@ def split_filter(filter_type):
 
 
 def custom_filter(probe, type):
-    script_dir = os.path.dirname(os.path.abspath(__file__))
-    filter_dir = os.path.join(script_dir, 'filter')
+    filter_dir = os.path.dirname(os.path.abspath(__file__))
     filters = []
 
     for filter in glob(os.path.join(filter_dir, f'{type}_*')):
         filter = os.path.splitext(os.path.basename(filter))[0]
-        filter_func = locate(f'ffplayout.filter.{filter}.filter')
+        filter_func = locate(f'ffplayout.filters.{filter}.filter')
         filters.append(filter_func(probe))
 
     return filters

ffplayout/folder.py

@@ -25,7 +25,7 @@ import time
 from watchdog.events import PatternMatchingEventHandler
 from watchdog.observers import Observer
 
-from .filters import build_filtergraph
+from .filters.default import build_filtergraph
 from .utils import MediaProbe, _current, _ff, _storage, messenger, stdin_args
 
 # ------------------------------------------------------------------------------

ffplayout/playlist.py

@@ -23,11 +23,10 @@ import ssl
 import time
 from urllib import request
 
-from ffplayout.filters import build_filtergraph
-from ffplayout.utils import (MediaProbe, _playlist, gen_filler, get_date,
-                             get_delta, get_time, is_float, messenger,
-                             stdin_args, timed_source, valid_json,
-                             validate_thread)
+from .filters.default import build_filtergraph
+from .utils import (MediaProbe, _playlist, gen_filler, get_date, get_delta,
+                    get_time, is_float, messenger, stdin_args, timed_source,
+                    valid_json, validate_thread)
 
 
 class GetSourceFromPlaylist: