slur support

Author: oxygen-dioxide

server.py

@@ -80,15 +80,21 @@ def acoustic(ustpath:str):
                 lyric=block["Lyric"]
                 notenum=int(block["NoteNum"])
                 length=int(block["Length"])
-                if(lyric!="R"):
+                if(lyric=="-"):#；连音符
+                    ph_seq.append(ph_seq[-1])
+                    note_seq.append(notedict[notenum%12]+str(notenum//12-1))
+                    ph_dur.append(str(length/(tempo*8)))
+                    is_slur_seq.append("1")
+                elif(lyric!="R"):
                     ph_seq.append(lyric)
                     note_seq.append(notedict[notenum%12]+str(notenum//12-1))
                     ph_dur.append(str(length/(tempo*8)))
                     is_slur_seq.append("0")
-    
+    ph_seq=" ".join(ph_seq)
+    print("Phonemes:",ph_seq)
     inp={
         "text":"",
-        "ph_seq":" ".join(ph_seq),
+        "ph_seq":ph_seq,
         "note_seq":" ".join(note_seq),
         "ph_dur":" ".join(ph_dur),
         "note_dur_seq":" ".join(ph_dur),
@@ -118,8 +124,8 @@ def main():
 
     for message in poll_socket(socket):
         request = json.loads(message)
+        print("="*40)
         print('Received request: %s' % request)
-
         response = {}
         try:
             #if request[0] == 'timing':

utils/hparams.py

@@ -45,7 +45,11 @@ def set_hparams(config='', exp_name='', hparams_str='', print_hparams=True, glob
     loaded_config = set()
 
     def load_config(config_fn):  # deep first
-        with open(os.path.abspath(".\\"+config_fn), encoding='utf-8') as f:
+        if(config_fn.startswith("/")):
+            config_fn_path=os.path.abspath(config_fn[1:])
+        else:
+            config_fn_path=config_fn
+        with open(config_fn_path, encoding='utf-8') as f:
             hparams_ = yaml.safe_load(f)
         loaded_config.add(config_fn)
         if 'base_config' in hparams_: