[Tts/Stt/VoiceControl] Fix indent and lock issue (#63)

Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/src/Tizen.Uix.Stt/Interop/Interop.Stt.cs b/src/Tizen.Uix.Stt/Interop/Interop.Stt.cs
index b2df927..3ce59e2 100755 (executable)
--- a/src/Tizen.Uix.Stt/Interop/Interop.Stt.cs
+++ b/src/Tizen.Uix.Stt/Interop/Interop.Stt.cs
@@ -28,7 +28,7 @@ internal static partial class Interop
     /// </summary>
     internal static class Stt
     {
-        internal static string LogTag = "Tizen.Uix.Stt";
+        internal const string LogTag = "Tizen.Uix.Stt";
 
         private const int ErrorStt = -0x02F00000;
 

diff --git a/src/Tizen.Uix.Stt/Tizen.Uix.Stt/SttClient.cs b/src/Tizen.Uix.Stt/Tizen.Uix.Stt/SttClient.cs
index 17cb9ec..109921f 100755 (executable)
--- a/src/Tizen.Uix.Stt/Tizen.Uix.Stt/SttClient.cs
+++ b/src/Tizen.Uix.Stt/Tizen.Uix.Stt/SttClient.cs
@@ -374,18 +374,18 @@ namespace Tizen.Uix.Stt
                 lock (thisLock)
                 {
                     _resultDelegate = (IntPtr handle, ResultEvent e, IntPtr data, int dataCount, IntPtr msg, IntPtr userData) =>
-                {
-                    Log.Info(LogTag, "Recognition Result Event Triggered");
-                    if (data != null && msg != null)
-                    {
-                        RecognitionResultEventArgs args = new RecognitionResultEventArgs(e, data, dataCount, Marshal.PtrToStringAnsi(msg));
-                        _recognitionResult?.Invoke(this, args);
-                    }
-                    else
                     {
-                        Log.Info(LogTag, "Recognition Result Event null received");
-                    }
-                };
+                        Log.Info(LogTag, "Recognition Result Event Triggered");
+                        if (data != null && msg != null)
+                        {
+                            RecognitionResultEventArgs args = new RecognitionResultEventArgs(e, data, dataCount, Marshal.PtrToStringAnsi(msg));
+                            _recognitionResult?.Invoke(this, args);
+                        }
+                        else
+                        {
+                            Log.Info(LogTag, "Recognition Result Event null received");
+                        }
+                    };
                     SttError error = SttSetRecognitionResultCB(_handle, _resultDelegate, IntPtr.Zero);
                     if (error != SttError.None)
                     {
@@ -438,7 +438,6 @@ namespace Tizen.Uix.Stt
                     {
                         _stateChanged += value;
                     }
-
                 }
             }
 
@@ -469,10 +468,10 @@ namespace Tizen.Uix.Stt
                 lock (thisLock)
                 {
                     _errorDelegate = (IntPtr handle, SttError reason, IntPtr userData) =>
-                {
-                    ErrorOccurredEventArgs args = new ErrorOccurredEventArgs(handle, reason);
-                    _errorOccurred?.Invoke(this, args);
-                };
+                    {
+                        ErrorOccurredEventArgs args = new ErrorOccurredEventArgs(handle, reason);
+                        _errorOccurred?.Invoke(this, args);
+                    };
                     SttError error = SttSetErrorCB(_handle, _errorDelegate, IntPtr.Zero);
                     if (error != SttError.None)
                     {
@@ -484,7 +483,6 @@ namespace Tizen.Uix.Stt
                         _errorOccurred += value;
                     }
                 }
-
             }
 
             remove
@@ -513,12 +511,12 @@ namespace Tizen.Uix.Stt
                 lock (thisLock)
                 {
                     _languageDelegate = (IntPtr handle, IntPtr previousLanguage, IntPtr currentLanguage, IntPtr userData) =>
-                {
-                    string previousLanguageString = Marshal.PtrToStringAnsi(previousLanguage);
-                    string currentLanguageString = Marshal.PtrToStringAnsi(currentLanguage);
-                    DefaultLanguageChangedEventArgs args = new DefaultLanguageChangedEventArgs(previousLanguageString, currentLanguageString);
-                    _defaultLanguageChanged?.Invoke(this, args);
-                };
+                    {
+                        string previousLanguageString = Marshal.PtrToStringAnsi(previousLanguage);
+                        string currentLanguageString = Marshal.PtrToStringAnsi(currentLanguage);
+                        DefaultLanguageChangedEventArgs args = new DefaultLanguageChangedEventArgs(previousLanguageString, currentLanguageString);
+                        _defaultLanguageChanged?.Invoke(this, args);
+                    };
                     SttError error = SttSetDefaultLanguageChangedCB(_handle, _languageDelegate, IntPtr.Zero);
                     if (error != SttError.None)
                     {
@@ -530,7 +528,6 @@ namespace Tizen.Uix.Stt
                         _defaultLanguageChanged += value;
                     }
                 }
-
             }
 
             remove
@@ -560,12 +557,12 @@ namespace Tizen.Uix.Stt
                 lock (thisLock)
                 {
                     _engineDelegate = (IntPtr handle, IntPtr engineId, IntPtr language, bool supportSilence, bool needCredential, IntPtr userData) =>
-                {
-                    string engineIdString = Marshal.PtrToStringAnsi(engineId);
-                    string languageString = Marshal.PtrToStringAnsi(language);
-                    EngineChangedEventArgs args = new EngineChangedEventArgs(engineIdString, languageString, supportSilence, needCredential);
-                    _engineChanged?.Invoke(this, args);
-                };
+                    {
+                        string engineIdString = Marshal.PtrToStringAnsi(engineId);
+                        string languageString = Marshal.PtrToStringAnsi(language);
+                        EngineChangedEventArgs args = new EngineChangedEventArgs(engineIdString, languageString, supportSilence, needCredential);
+                        _engineChanged?.Invoke(this, args);
+                    };
                     SttError error = SttSetEngineChangedCB(_handle, _engineDelegate, IntPtr.Zero);
                     if (error != SttError.None)
                     {
@@ -653,7 +650,6 @@ namespace Tizen.Uix.Stt
                         Log.Error(LogTag, "GetRecordingVolume Failed with error " + error);
                         return 0.0f;
                     }
-
                 }
 
                 return volume;
@@ -887,13 +883,13 @@ namespace Tizen.Uix.Stt
             lock (thisLock)
             {
                 SupportedEngineCallback supportedEngineDelegate = (IntPtr handle, IntPtr engineId, IntPtr engineName, IntPtr userData) =>
-            {
-                string id = Marshal.PtrToStringAnsi(engineId);
-                string name = Marshal.PtrToStringAnsi(engineName);
-                SupportedEngine engine = new SupportedEngine(id, name);
-                engineList.Add(engine);
-                return true;
-            };
+                {
+                    string id = Marshal.PtrToStringAnsi(engineId);
+                    string name = Marshal.PtrToStringAnsi(engineName);
+                    SupportedEngine engine = new SupportedEngine(id, name);
+                    engineList.Add(engine);
+                    return true;
+                };
                 SttError error = SttForeEachSupportedEngines(_handle, supportedEngineDelegate, IntPtr.Zero);
                 if (error != SttError.None)
                 {
@@ -1040,11 +1036,11 @@ namespace Tizen.Uix.Stt
             lock (thisLock)
             {
                 SupportedLanguageCallback supportedLanguageDelegate = (IntPtr handle, IntPtr language, IntPtr userData) =>
-            {
-                string lang = Marshal.PtrToStringAnsi(language);
-                languageList.Add(lang);
-                return true;
-            };
+                {
+                    string lang = Marshal.PtrToStringAnsi(language);
+                    languageList.Add(lang);
+                    return true;
+                };
 
                 SttError error = SttForeachSupportedLanguages(_handle, supportedLanguageDelegate, IntPtr.Zero);
                 if (error != SttError.None)
@@ -1121,7 +1117,6 @@ namespace Tizen.Uix.Stt
                             recType = "stt.recognition.type.MAP";
                             break;
                         }
-
                 }
 
                 SttError error = SttIsRecognitionTypeSupported(_handle, recType, out supported);
@@ -1130,7 +1125,6 @@ namespace Tizen.Uix.Stt
                     Log.Error(LogTag, "IsRecognitionTypeSupported Failed with error " + error);
                     throw ExceptionFactory.CreateException(error);
                 }
-
             }
 
             return supported;
@@ -1392,7 +1386,6 @@ namespace Tizen.Uix.Stt
                             recType = "stt.recognition.type.MAP";
                             break;
                         }
-
                 }
 
                 SttError error = SttStart(_handle, language, recType);
@@ -1513,10 +1506,13 @@ namespace Tizen.Uix.Stt
             {
                 if (disposing)
                 {
-                    SttError error = SttDestroy(_handle);
-                    if (error != SttError.None)
+                    lock (thisLock)
                     {
-                        Log.Error(LogTag, "Destroy Failed with error " + error);
+                        SttError error = SttDestroy(_handle);
+                        if (error != SttError.None)
+                        {
+                            Log.Error(LogTag, "Destroy Failed with error " + error);
+                        }
                     }
                 }
 

diff --git a/src/Tizen.Uix.SttEngine/Interop/Interop.SttEngine.cs b/src/Tizen.Uix.SttEngine/Interop/Interop.SttEngine.cs
index 25394c8..91a4526 100755 (executable)
--- a/src/Tizen.Uix.SttEngine/Interop/Interop.SttEngine.cs
+++ b/src/Tizen.Uix.SttEngine/Interop/Interop.SttEngine.cs
@@ -30,7 +30,7 @@ internal static partial class Interop
     /// </summary>
     internal static class SttEngine
     {
-        internal static string LogTag = "Tizen.Uix.SttEngine";
+        internal const string LogTag = "Tizen.Uix.SttEngine";
 
         private const int ErrorStt = -0x02F00000;
 

diff --git a/src/Tizen.Uix.Tts/Interop/Interop.Tts.cs b/src/Tizen.Uix.Tts/Interop/Interop.Tts.cs
index 21a3a67..b3b787a 100755 (executable)
--- a/src/Tizen.Uix.Tts/Interop/Interop.Tts.cs
+++ b/src/Tizen.Uix.Tts/Interop/Interop.Tts.cs
@@ -29,7 +29,7 @@ internal static partial class Interop
     /// </summary>
     internal static class Tts
     {
-        internal static string LogTag = "Tizen.Uix.Tts";
+        internal const string LogTag = "Tizen.Uix.Tts";
 
         private const int ErrorTts = -0x02F10000;
 

diff --git a/src/Tizen.Uix.Tts/Tizen.Uix.Tts/TtsClient.cs b/src/Tizen.Uix.Tts/Tizen.Uix.Tts/TtsClient.cs
index 772a0ef..7dab0ae 100755 (executable)
--- a/src/Tizen.Uix.Tts/Tizen.Uix.Tts/TtsClient.cs
+++ b/src/Tizen.Uix.Tts/Tizen.Uix.Tts/TtsClient.cs
@@ -250,10 +250,10 @@ namespace Tizen.Uix.Tts
                 lock (thisLock)
                 {
                     _stateDelegate = (IntPtr handle, State previous, State current, IntPtr userData) =>
-                {
-                    StateChangedEventArgs args = new StateChangedEventArgs(previous, current);
-                    _stateChanged?.Invoke(this, args);
-                };
+                    {
+                        StateChangedEventArgs args = new StateChangedEventArgs(previous, current);
+                        _stateChanged?.Invoke(this, args);
+                    };
                     TtsError error = TtsSetStateChangedCB(_handle, _stateDelegate, IntPtr.Zero);
                     if (error != TtsError.None)
                     {
@@ -294,10 +294,10 @@ namespace Tizen.Uix.Tts
                 lock (thisLock)
                 {
                     _utteranceStartedResultDelegate = (IntPtr handle, int uttId, IntPtr userData) =>
-                {
-                    UtteranceEventArgs args = new UtteranceEventArgs(uttId);
-                    _utteranceStarted?.Invoke(this, args);
-                };
+                    {
+                        UtteranceEventArgs args = new UtteranceEventArgs(uttId);
+                        _utteranceStarted?.Invoke(this, args);
+                    };
                     TtsError error = TtsSetUtteranceStartedCB(_handle, _utteranceStartedResultDelegate, IntPtr.Zero);
                     if (error != TtsError.None)
                     {
@@ -336,10 +336,10 @@ namespace Tizen.Uix.Tts
                 lock (thisLock)
                 {
                     _utteranceCompletedResultDelegate = (IntPtr handle, int uttId, IntPtr userData) =>
-                {
-                    UtteranceEventArgs args = new UtteranceEventArgs(uttId);
-                    _utteranceCompleted?.Invoke(this, args);
-                };
+                    {
+                        UtteranceEventArgs args = new UtteranceEventArgs(uttId);
+                        _utteranceCompleted?.Invoke(this, args);
+                    };
                     TtsError error = TtsSetUtteranceCompletedCB(_handle, _utteranceCompletedResultDelegate, IntPtr.Zero);
                     if (error != TtsError.None)
                     {
@@ -378,10 +378,10 @@ namespace Tizen.Uix.Tts
                 lock (thisLock)
                 {
                     _errorDelegate = (IntPtr handle, int uttId, TtsError reason, IntPtr userData) =>
-                {
-                    ErrorOccurredEventArgs args = new ErrorOccurredEventArgs(handle, uttId, reason);
-                    _errorOccurred?.Invoke(this, args);
-                };
+                    {
+                        ErrorOccurredEventArgs args = new ErrorOccurredEventArgs(handle, uttId, reason);
+                        _errorOccurred?.Invoke(this, args);
+                    };
                     TtsError error = TtsSetErrorCB(_handle, _errorDelegate, IntPtr.Zero);
                     if (error != TtsError.None)
                     {
@@ -421,12 +421,12 @@ namespace Tizen.Uix.Tts
                 lock (thisLock)
                 {
                     _voiceChangedDelegate = (IntPtr handle, IntPtr previousLanguage, int previousVoiceType, IntPtr currentLanguage, int currentVoiceType, IntPtr userData) =>
-                {
-                    string previousLanguageString = Marshal.PtrToStringAnsi(previousLanguage);
-                    string currentLanguageString = Marshal.PtrToStringAnsi(currentLanguage);
-                    DefaultVoiceChangedEventArgs args = new DefaultVoiceChangedEventArgs(previousLanguageString, previousVoiceType, currentLanguageString, currentVoiceType);
-                    _defaultVoiceChanged?.Invoke(this, args);
-                };
+                    {
+                        string previousLanguageString = Marshal.PtrToStringAnsi(previousLanguage);
+                        string currentLanguageString = Marshal.PtrToStringAnsi(currentLanguage);
+                        DefaultVoiceChangedEventArgs args = new DefaultVoiceChangedEventArgs(previousLanguageString, previousVoiceType, currentLanguageString, currentVoiceType);
+                        _defaultVoiceChanged?.Invoke(this, args);
+                    };
                     TtsError error = TtsSetDefaultVoiceChangedCB(_handle, _voiceChangedDelegate, IntPtr.Zero);
                     if (error != TtsError.None)
                     {
@@ -467,12 +467,12 @@ namespace Tizen.Uix.Tts
                 lock (thisLock)
                 {
                     _engineDelegate = (IntPtr handle, IntPtr engineId, IntPtr language, int voiceType, bool needCredential, IntPtr userData) =>
-                {
-                    string engineIdString = Marshal.PtrToStringAnsi(engineId);
-                    string languageString = Marshal.PtrToStringAnsi(language);
-                    EngineChangedEventArgs args = new EngineChangedEventArgs(engineIdString, languageString, voiceType, needCredential);
-                    _engineChanged?.Invoke(this, args);
-                };
+                    {
+                        string engineIdString = Marshal.PtrToStringAnsi(engineId);
+                        string languageString = Marshal.PtrToStringAnsi(language);
+                        EngineChangedEventArgs args = new EngineChangedEventArgs(engineIdString, languageString, voiceType, needCredential);
+                        _engineChanged?.Invoke(this, args);
+                    };
                     TtsError error = TtsSetEngineChangedCB(_handle, _engineDelegate, IntPtr.Zero);
                     if (error != TtsError.None)
                     {
@@ -556,7 +556,6 @@ namespace Tizen.Uix.Tts
                         Log.Error(LogTag, "MaxTextSize Failed with error " + error);
                         return 0;
                     }
-
                 }
 
                 return maxTextSize;
@@ -587,7 +586,6 @@ namespace Tizen.Uix.Tts
                         Log.Error(LogTag, "CurrentState Failed with error " + error);
                         return State.Unavailable;
                     }
-
                 }
 
                 return state;
@@ -756,19 +754,18 @@ namespace Tizen.Uix.Tts
             lock (thisLock)
             {
                _supportedvoiceDelegate = (IntPtr handle, IntPtr language, int voiceType, IntPtr userData) =>
-            {
-                string lang = Marshal.PtrToStringAnsi(language);
-                SupportedVoice voice = new SupportedVoice(lang, voiceType);
-                voicesList.Add(voice);
-                return true;
-            };
+                {
+                    string lang = Marshal.PtrToStringAnsi(language);
+                    SupportedVoice voice = new SupportedVoice(lang, voiceType);
+                    voicesList.Add(voice);
+                    return true;
+                };
                 TtsError error = TtsForeachSupportedVoices(_handle, _supportedvoiceDelegate, IntPtr.Zero);
                 if (error != TtsError.None)
                 {
                     Log.Error(LogTag, "GetSupportedVoices Failed with error " + error);
                     throw ExceptionFactory.CreateException(error);
                 }
-
             }
 
             return voicesList;
@@ -808,7 +805,6 @@ namespace Tizen.Uix.Tts
                     Log.Error(LogTag, "GetPrivateData Failed with error " + error);
                     throw ExceptionFactory.CreateException(error);
                 }
-
             }
 
             return data;
@@ -881,7 +877,6 @@ namespace Tizen.Uix.Tts
                     Log.Error(LogTag, "GetSpeedRange Failed with error " + error);
                     throw ExceptionFactory.CreateException(error);
                 }
-
             }
 
             return new SpeedRange(min, normal, max);
@@ -935,7 +930,6 @@ namespace Tizen.Uix.Tts
                     Log.Error(LogTag, "AddText Failed with error " + error);
                     throw ExceptionFactory.CreateException(error);
                 }
-
             }
 
             return id;
@@ -1062,10 +1056,13 @@ namespace Tizen.Uix.Tts
             {
                 if (disposing)
                 {
-                    TtsError error = TtsDestroy(_handle);
-                    if (error != TtsError.None)
+                    lock (thisLock)
                     {
-                        Log.Error(LogTag, "Destroy Failed with error " + error);
+                        TtsError error = TtsDestroy(_handle);
+                        if (error != TtsError.None)
+                        {
+                            Log.Error(LogTag, "Destroy Failed with error " + error);
+                        }
                     }
                 }
 

diff --git a/src/Tizen.Uix.TtsEngine/Interop/Interop.TtsEngine.cs b/src/Tizen.Uix.TtsEngine/Interop/Interop.TtsEngine.cs
index 70270a7..4bcf7e1 100755 (executable)
--- a/src/Tizen.Uix.TtsEngine/Interop/Interop.TtsEngine.cs
+++ b/src/Tizen.Uix.TtsEngine/Interop/Interop.TtsEngine.cs
@@ -30,7 +30,7 @@ internal static partial class Interop
     /// </summary>
     internal static class TtsEngine
     {
-        internal static string LogTag = "Tizen.Uix.TtsEngine";
+        internal const string LogTag = "Tizen.Uix.TtsEngine";
 
         private const int ErrorTts = -0x02F10000;
 

diff --git a/src/Tizen.Uix.VoiceControl/Interop/Interop.VoiceControl.cs b/src/Tizen.Uix.VoiceControl/Interop/Interop.VoiceControl.cs
index e675aee..d7685cc 100755 (executable)
--- a/src/Tizen.Uix.VoiceControl/Interop/Interop.VoiceControl.cs
+++ b/src/Tizen.Uix.VoiceControl/Interop/Interop.VoiceControl.cs
@@ -30,7 +30,7 @@ internal static partial class Interop
     /// </summary>
     internal static class VoiceControl
     {
-        internal static string LogTag = "Tizen.Uix.VoiceControl";
+        internal const string LogTag = "Tizen.Uix.VoiceControl";
 
         private const int ErrorVoiceControl = -0x02F50000;