aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Sachs <larry.j.sachs@intel.com>2018-08-14 10:48:09 -0700
committerLarry Sachs <larry.j.sachs@intel.com>2018-08-14 10:48:09 -0700
commit6105bc199500627e3c8435c908badc65925afb4b (patch)
treee602970bf718259811aa28b42b4dc1cad35f8219
parent66899385336fe99e089c43d2e1568b872a307f23 (diff)
Update per CR 2259HEADmaster
For Media Control attributes, camelCaseNames have been replaced with lower_case_underscored_names. Change-Id: I3a90fd8a77e348b5b9f4d553f675c00ad725ed6f Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
-rw-r--r--android/examples/upnpavclient/src/main/java/org/iotivity/base/examples/MediaControl.java8
-rw-r--r--plugins/upnp_plugin/UpnpAvTransportService.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/android/examples/upnpavclient/src/main/java/org/iotivity/base/examples/MediaControl.java b/android/examples/upnpavclient/src/main/java/org/iotivity/base/examples/MediaControl.java
index 05443d9..aa658d5 100644
--- a/android/examples/upnpavclient/src/main/java/org/iotivity/base/examples/MediaControl.java
+++ b/android/examples/upnpavclient/src/main/java/org/iotivity/base/examples/MediaControl.java
@@ -41,16 +41,16 @@ public class MediaControl extends Service implements Parcelable {
public static final String UPNP_OIC_URI_PREFIX_MEDIA_CONTROL = "/upnp/mediaControl/";
public static final String UPNP_OIC_URI_PREFIX_MEDIA_CONTROL_NM_HREF = "/upnp/mediaControl/AVTransport/";
- public static final String STATE_KEY = "playState";
+ public static final String STATE_KEY = "play_state";
public static final boolean DEFAULT_STATE = false;
- public static final String SPEED_KEY = "mediaSpeed";
+ public static final String SPEED_KEY = "media_speed";
public static final double DEFAULT_SPEED = 1.0;
- public static final String LOCATION_KEY = "mediaLocation";
+ public static final String LOCATION_KEY = "media_location";
public static final String DEFAULT_LOCATION = "00:00:00";
- public static final String LAST_ACTION_KEY = "lastAction";
+ public static final String LAST_ACTION_KEY = "action";
public static final String DEFAULT_LAST_ACTION = "stop";
public static final String ACTIONS_KEY = "actions";
diff --git a/plugins/upnp_plugin/UpnpAvTransportService.cpp b/plugins/upnp_plugin/UpnpAvTransportService.cpp
index a87cfdf..1ecd12e 100644
--- a/plugins/upnp_plugin/UpnpAvTransportService.cpp
+++ b/plugins/upnp_plugin/UpnpAvTransportService.cpp
@@ -24,10 +24,10 @@ static const string MODULE = "UpnpAvTransportService";
// AV Transport Service
-static const char *playStatePropertyName = "playState";
-static const char *mediaSpeedPropertyName = "mediaSpeed";
-static const char *mediaLocationPropertyName = "mediaLocation";
-static const char *lastActionPropertyName = "lastAction";
+static const char *playStatePropertyName = "play_state";
+static const char *mediaSpeedPropertyName = "media_speed";
+static const char *mediaLocationPropertyName = "media_location";
+static const char *lastActionPropertyName = "action";
static const char *actionsPropertyName = "actions";
static const char *actionPropertyName = "action";