Update thread-unsafe operations to thread-safe ones on automatic turn…

…-taking
isir · Sep 27, 2024 · f261426 · f261426
1 parent 5c45414
commit f261426
Show file tree

Hide file tree

Showing 15 changed files with 714 additions and 1,628 deletions.
diff --git a/application/Modular/nbproject/build-impl.xml~ b/application/Modular/nbproject/build-impl.xml~
@@ -1120,6 +1120,14 @@ is divided into following sections:
             <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
             <param name="transfer.not.archive.disabled" value="true"/>
         </antcall>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.Incrementality}" name="call.subproject"/>
+            <param location="${project.Incrementality}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
         <antcall target="-maybe-call-dep">
             <param name="call.built.properties" value="${built-jar.properties}"/>
             <param location="${project.Intentions}" name="call.subproject"/>
@@ -2029,6 +2037,14 @@ is divided into following sections:
             <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
             <param name="transfer.not.archive.disabled" value="true"/>
         </antcall>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.Incrementality}" name="call.subproject"/>
+            <param location="${project.Incrementality}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
         <antcall target="-maybe-call-dep">
             <param name="call.built.properties" value="${built-clean.properties}"/>
             <param location="${project.Intentions}" name="call.subproject"/>

diff --git a/application/Modular/nbproject/genfiles.properties b/application/Modular/nbproject/genfiles.properties
@@ -1,5 +1,5 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ae3cedaa
-nbproject/build-impl.xml.script.CRC32=6caf6f03
+nbproject/build-impl.xml.data.CRC32=243167ff
+nbproject/build-impl.xml.script.CRC32=65331d43
 nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
diff --git a/application/Modular/nbproject/project.properties b/application/Modular/nbproject/project.properties
@@ -228,7 +228,7 @@ project.CereProc=../../auxiliary/TTS/CereProc
 project.ChatGPT=../../auxiliary/ChatGPT
 project.ConversationalGaze=../../auxiliary/ConversationalGaze
 project.CorrectionMesh=../../tools/CorrectionMesh
-project.DeepASR=../../../../greta-github/greta/auxiliary/DeepASR
+project.DeepASR=../../auxiliary/DeepASR
 project.Editors=../../tools/Editors
 project.EmotionML=../../auxiliary/EmotionML
 project.EnvironmentManager=../../auxiliary/EnvironmentManager
@@ -250,7 +250,7 @@ project.ListenerIntentPlanner=../../core/ListenerIntentPlanner
 project.LLM=../../auxiliary/LLM
 project.MaryTTS=../../auxiliary/TTS/MaryTTS
 project.MeaningMiner=../../auxiliary/MeaningMiner
-project.Microphone=../../../../greta-github/greta/auxiliary/Microphone
+project.Microphone=../../auxiliary/Microphone
 project.MPEG4=../../core/MPEG4
 project.MultiLayerAttitudePlanner=../../auxiliary/MultiLayerAttitudePlanner
 project.OgrePlayer=../../auxiliary/OgrePlayer
@@ -266,7 +266,7 @@ project.SpeechRecognizer=../../auxiliary/SpeechRecognizer
 project.SSI=../../auxiliary/SSI
 project.SubjectPlanner=../../core/SubjectPlanner
 project.Thrift=../../auxiliary/Thrift
-project.TurnManagement=../../../../greta-github/greta/auxiliary/TurnManagement
+project.TurnManagement=../../auxiliary/TurnManagement
 project.Util=../../core/Util
 project.Utilx=../../core/Utilx
 project.VideoCapture=../../tools/VideoCapture

diff --git a/auxiliary/DeepASR/src/greta/auxiliary/deepasr/DeepASRFrame.java b/auxiliary/DeepASR/src/greta/auxiliary/deepasr/DeepASRFrame.java
@@ -66,8 +66,9 @@ public class DeepASRFrame extends javax.swing.JFrame implements FeedbackPerforme
 
     protected Server server;
     protected Socket soc;
-    protected String answ;
+//    protected String answ;
     protected ArrayList<LLMFrame> llms = new ArrayList<LLMFrame>();
+
     protected volatile Boolean IsListenning = Boolean.FALSE;
 
     private String DeepASR_python_env_checker_path = "Common\\Data\\DeepASR\\DeepGram\\check_env.py";
@@ -79,14 +80,14 @@ public class DeepASRFrame extends javax.swing.JFrame implements FeedbackPerforme
 
     protected CharacterManager cm;
     private static String markup = "fml-apml";
-
-    public String getAnswer() {
-        return answ;
-    }
-
-    public void setAnswer(String answer) {
-        this.answ = answer;
-    }
+        
+//    public String getAnswer() {
+//        return answ;
+//    }
+//
+//    public void setAnswer(String answer) {
+//        this.answ = answer;
+//    }
 
    public void performFeedback(String type){
        //TO IMPLEMENT on subclass
@@ -132,7 +133,7 @@ public boolean areDetailsOnGestures(){
 
     public DeepASRFrame(CharacterManager cm) {
 
-        server = new Server();       
+        // server = new Server();       
         this.cm=cm;
 
     }