Rename methods for clarity

HakkyuKim · HakkyuKim · commit 4e45da35fd95 · 2022-05-09T10:11:00.000+09:00
diff --git a/packages/audioplayers/tizen/src/audioplayers_tizen_plugin.cc b/packages/audioplayers/tizen/src/audioplayers_tizen_plugin.cc
@@ -82,29 +82,29 @@ class AudioplayersTizenPlugin : public flutter::Plugin {
       if (GetValueFromEncodableMap(arguments, "volume", volume)) {
         auto tizen_result = player->SetVolume(volume);
         if (!tizen_result) {
-          result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+          result->Error(tizen_result.code(), tizen_result.message());
           return;
         }
       }
 
       if (GetValueFromEncodableMap(arguments, "url", url)) {
         auto tizen_result = player->SetUrl(url);
         if (!tizen_result) {
-          result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+          result->Error(tizen_result.code(), tizen_result.message());
           return;
         }
       }
 
       auto tizen_result = player->Play();
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
 
       if (GetValueFromEncodableMap(arguments, "position", position)) {
         auto tizen_result = player->Seek(position);
         if (!tizen_result) {
-          result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+          result->Error(tizen_result.code(), tizen_result.message());
           return;
         }
       }
@@ -118,29 +118,29 @@ class AudioplayersTizenPlugin : public flutter::Plugin {
       if (GetValueFromEncodableMap(arguments, "volume", volume)) {
         auto tizen_result = player->SetVolume(volume);
         if (!tizen_result) {
-          result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+          result->Error(tizen_result.code(), tizen_result.message());
           return;
         }
       }
 
       if (GetValueFromEncodableMap(arguments, "bytes", bytes)) {
         auto tizen_result = player->SetDataSource(bytes);
         if (!tizen_result) {
-          result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+          result->Error(tizen_result.code(), tizen_result.message());
           return;
         }
       }
 
       auto tizen_result = player->Play();
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
 
       if (GetValueFromEncodableMap(arguments, "position", position)) {
         auto tizen_result = player->Seek(position);
         if (!tizen_result) {
-          result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+          result->Error(tizen_result.code(), tizen_result.message());
           return;
         }
       }
@@ -149,21 +149,21 @@ class AudioplayersTizenPlugin : public flutter::Plugin {
     } else if (method_name == "resume") {
       auto tizen_result = player->Play();
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
       result->Success(flutter::EncodableValue(1));
     } else if (method_name == "pause") {
       auto tizen_result = player->Pause();
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
       result->Success(flutter::EncodableValue(1));
     } else if (method_name == "stop") {
       auto tizen_result = player->Stop();
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
       result->Success(flutter::EncodableValue(1));
@@ -181,7 +181,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {
 
       auto tizen_result = player->Seek(position);
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
 
@@ -196,7 +196,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {
 
       auto tizen_result = player->SetVolume(volume);
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
 
@@ -210,7 +210,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {
       }
       auto tizen_result = player->SetUrl(url);
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
 
@@ -225,7 +225,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {
       }
       auto tizen_result = player->SetPlaybackRate(playback_rate);
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
 
@@ -253,7 +253,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {
 
       auto tizen_result = player->SetReleaseMode(release_mode_enum);
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
 
@@ -262,7 +262,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {
       int32_t duration;
       auto tizen_result = player->GetDuration(duration);
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
 
@@ -271,7 +271,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {
       int32_t position;
       auto tizen_result = player->GetCurrentPosition(position);
       if (!tizen_result) {
-        result->Error(tizen_result.Message(), tizen_result.TizenMessage());
+        result->Error(tizen_result.code(), tizen_result.message());
         return;
       }
 
diff --git a/packages/audioplayers/tizen/src/tizen_result.h b/packages/audioplayers/tizen/src/tizen_result.h
@@ -9,21 +9,22 @@ class TizenResult {
  public:
   // Creates a "successful" result.
   TizenResult() : TizenResult(TIZEN_ERROR_NONE, "") {}
-  TizenResult(int code) : TizenResult(code, "") {}
-  TizenResult(int code, const std::string &message)
-      : error_code_(code), message_(message) {}
+  TizenResult(int result) : TizenResult(result, "") {}
+  TizenResult(int result, const std::string &code)
+      : result_(result), code_(code) {}
 
   // Returns false on error.
-  operator bool() const { return (error_code_ == TIZEN_ERROR_NONE); }
+  operator bool() const { return result_ == TIZEN_ERROR_NONE; }
 
-  std::string TizenMessage() const { return get_error_message(error_code_); }
-  std::string Message() const {
-    return message_.empty() ? get_error_message(error_code_) : message_;
+  std::string code() const {
+    return code_.empty() ? std::to_string(result_) : code_;
   }
 
+  std::string message() const { return get_error_message(result_); }
+
  private:
-  int error_code_ = TIZEN_ERROR_NONE;
-  std::string message_;
+  int result_ = TIZEN_ERROR_NONE;
+  std::string code_;
 };
 
 #endif  // FLUTTER_PLUGIN_TIZEN_RESULT_H_

Original file line number	Diff line number	Diff line change
`@@ -82,29 +82,29 @@ class AudioplayersTizenPlugin : public flutter::Plugin {`
`82`	`82`	`if (GetValueFromEncodableMap(arguments, "volume", volume)) {`
`83`	`83`	`auto tizen_result = player->SetVolume(volume);`
`84`	`84`	`if (!tizen_result) {`
`85`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`85`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`86`	`86`	`return;`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`if (GetValueFromEncodableMap(arguments, "url", url)) {`
`91`	`91`	`auto tizen_result = player->SetUrl(url);`
`92`	`92`	`if (!tizen_result) {`
`93`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`93`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`94`	`94`	`return;`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`auto tizen_result = player->Play();`
`99`	`99`	`if (!tizen_result) {`
`100`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`100`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`101`	`101`	`return;`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`if (GetValueFromEncodableMap(arguments, "position", position)) {`
`105`	`105`	`auto tizen_result = player->Seek(position);`
`106`	`106`	`if (!tizen_result) {`
`107`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`107`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`108`	`108`	`return;`
`109`	`109`	`}`
`110`	`110`	`}`
`@@ -118,29 +118,29 @@ class AudioplayersTizenPlugin : public flutter::Plugin {`
`118`	`118`	`if (GetValueFromEncodableMap(arguments, "volume", volume)) {`
`119`	`119`	`auto tizen_result = player->SetVolume(volume);`
`120`	`120`	`if (!tizen_result) {`
`121`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`121`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`122`	`122`	`return;`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if (GetValueFromEncodableMap(arguments, "bytes", bytes)) {`
`127`	`127`	`auto tizen_result = player->SetDataSource(bytes);`
`128`	`128`	`if (!tizen_result) {`
`129`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`129`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`130`	`130`	`return;`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`auto tizen_result = player->Play();`
`135`	`135`	`if (!tizen_result) {`
`136`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`136`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`137`	`137`	`return;`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`if (GetValueFromEncodableMap(arguments, "position", position)) {`
`141`	`141`	`auto tizen_result = player->Seek(position);`
`142`	`142`	`if (!tizen_result) {`
`143`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`143`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`144`	`144`	`return;`
`145`	`145`	`}`
`146`	`146`	`}`
`@@ -149,21 +149,21 @@ class AudioplayersTizenPlugin : public flutter::Plugin {`
`149`	`149`	`} else if (method_name == "resume") {`
`150`	`150`	`auto tizen_result = player->Play();`
`151`	`151`	`if (!tizen_result) {`
`152`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`152`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`153`	`153`	`return;`
`154`	`154`	`}`
`155`	`155`	`result->Success(flutter::EncodableValue(1));`
`156`	`156`	`} else if (method_name == "pause") {`
`157`	`157`	`auto tizen_result = player->Pause();`
`158`	`158`	`if (!tizen_result) {`
`159`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`159`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`160`	`160`	`return;`
`161`	`161`	`}`
`162`	`162`	`result->Success(flutter::EncodableValue(1));`
`163`	`163`	`} else if (method_name == "stop") {`
`164`	`164`	`auto tizen_result = player->Stop();`
`165`	`165`	`if (!tizen_result) {`
`166`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`166`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`167`	`167`	`return;`
`168`	`168`	`}`
`169`	`169`	`result->Success(flutter::EncodableValue(1));`
`@@ -181,7 +181,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {`
`181`	`181`
`182`	`182`	`auto tizen_result = player->Seek(position);`
`183`	`183`	`if (!tizen_result) {`
`184`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`184`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`185`	`185`	`return;`
`186`	`186`	`}`
`187`	`187`
`@@ -196,7 +196,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {`
`196`	`196`
`197`	`197`	`auto tizen_result = player->SetVolume(volume);`
`198`	`198`	`if (!tizen_result) {`
`199`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`199`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`200`	`200`	`return;`
`201`	`201`	`}`
`202`	`202`
`@@ -210,7 +210,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {`
`210`	`210`	`}`
`211`	`211`	`auto tizen_result = player->SetUrl(url);`
`212`	`212`	`if (!tizen_result) {`
`213`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`213`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`214`	`214`	`return;`
`215`	`215`	`}`
`216`	`216`
`@@ -225,7 +225,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {`
`225`	`225`	`}`
`226`	`226`	`auto tizen_result = player->SetPlaybackRate(playback_rate);`
`227`	`227`	`if (!tizen_result) {`
`228`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`228`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`229`	`229`	`return;`
`230`	`230`	`}`
`231`	`231`
`@@ -253,7 +253,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {`
`253`	`253`
`254`	`254`	`auto tizen_result = player->SetReleaseMode(release_mode_enum);`
`255`	`255`	`if (!tizen_result) {`
`256`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`256`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`257`	`257`	`return;`
`258`	`258`	`}`
`259`	`259`
`@@ -262,7 +262,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {`
`262`	`262`	`int32_t duration;`
`263`	`263`	`auto tizen_result = player->GetDuration(duration);`
`264`	`264`	`if (!tizen_result) {`
`265`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`265`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`266`	`266`	`return;`
`267`	`267`	`}`
`268`	`268`
`@@ -271,7 +271,7 @@ class AudioplayersTizenPlugin : public flutter::Plugin {`
`271`	`271`	`int32_t position;`
`272`	`272`	`auto tizen_result = player->GetCurrentPosition(position);`
`273`	`273`	`if (!tizen_result) {`
`274`		`- result->Error(tizen_result.Message(), tizen_result.TizenMessage());`
	`274`	`+ result->Error(tizen_result.code(), tizen_result.message());`
`275`	`275`	`return;`
`276`	`276`	`}`
`277`	`277`