Skip to content

Commit

Permalink
Merge pull request #356 from smartdevicelink/feature/0198-media-skip-…
Browse files Browse the repository at this point in the history
…indicators

Add new API to SetMediaClockTimer
  • Loading branch information
crokita authored Jan 27, 2021
2 parents 0c79267 + ea6b478 commit 16fab63
Show file tree
Hide file tree
Showing 3 changed files with 236 additions and 2 deletions.
98 changes: 98 additions & 0 deletions lib/js/src/rpc/enums/SeekIndicatorType.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
/* eslint-disable camelcase */
/*
* Copyright (c) 2021, SmartDeviceLink Consortium, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following
* disclaimer in the documentation and/or other materials provided with the
* distribution.
*
* Neither the name of the SmartDeviceLink Consortium Inc. nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/

import { Enum } from '../../util/Enum.js';

/**
* @typedef {Enum} SeekIndicatorType
* @property {Object} _MAP
*/
class SeekIndicatorType extends Enum {
/**
* Constructor for SeekIndicatorType.
* @class
* @since SmartDeviceLink 7.1.0
*/
constructor () {
super();
}

/**
* Get the enum value for TRACK.
* @returns {String} - The enum value.
*/
static get TRACK () {
return SeekIndicatorType._MAP.TRACK;
}

/**
* Get the enum value for TIME.
* @returns {String} - The enum value.
*/
static get TIME () {
return SeekIndicatorType._MAP.TIME;
}

/**
* Get the value for the given enum key
* @param {*} key - A key to find in the map of the subclass
* @returns {*} - Returns a value if found, or null if not found
*/
static valueForKey (key) {
return SeekIndicatorType._valueForKey(key, SeekIndicatorType._MAP);
}

/**
* Get the key for the given enum value
* @param {*} value - A primitive value to find the matching key for in the map of the subclass
* @returns {*} - Returns a key if found, or null if not found
*/
static keyForValue (value) {
return SeekIndicatorType._keyForValue(value, SeekIndicatorType._MAP);
}

/**
* Retrieve all enumerated values for this class
* @returns {*} - Returns an array of values
*/
static values () {
return Object.values(SeekIndicatorType._MAP);
}
}

SeekIndicatorType._MAP = Object.freeze({
'TRACK': 'TRACK',
'TIME': 'TIME',
});

export { SeekIndicatorType };
47 changes: 45 additions & 2 deletions lib/js/src/rpc/messages/SetMediaClockTimer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable camelcase */
/*
* Copyright (c) 2020, SmartDeviceLink Consortium, Inc.
* Copyright (c) 2021, SmartDeviceLink Consortium, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -34,6 +34,7 @@
import { AudioStreamingIndicator } from '../enums/AudioStreamingIndicator.js';
import { FunctionID } from '../enums/FunctionID.js';
import { RpcRequest } from '../RpcRequest.js';
import { SeekStreamingIndicator } from '../structs/SeekStreamingIndicator.js';
import { StartTime } from '../structs/StartTime.js';
import { UpdateMode } from '../enums/UpdateMode.js';

Expand Down Expand Up @@ -130,11 +131,51 @@ class SetMediaClockTimer extends RpcRequest {
return this.getObject(AudioStreamingIndicator, SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR);
}

/**
* Set the ForwardSeekIndicator
* @since SmartDeviceLink 7.1.0
* @param {SeekStreamingIndicator} indicator - Used to control the forward seek button to either skip forward a set amount of time or to the next track. - The desired ForwardSeekIndicator.
* @returns {SetMediaClockTimer} - The class instance for method chaining.
*/
setForwardSeekIndicator (indicator) {
this._validateType(SeekStreamingIndicator, indicator);
this.setParameter(SetMediaClockTimer.KEY_FORWARD_SEEK_INDICATOR, indicator);
return this;
}

/**
* Get the ForwardSeekIndicator
* @returns {SeekStreamingIndicator} - the KEY_FORWARD_SEEK_INDICATOR value
*/
getForwardSeekIndicator () {
return this.getObject(SeekStreamingIndicator, SetMediaClockTimer.KEY_FORWARD_SEEK_INDICATOR);
}

/**
* Set the BackSeekIndicator
* @since SmartDeviceLink 7.1.0
* @param {SeekStreamingIndicator} indicator - Used to control the back seek button to either skip back a set amount of time or to the previous track. - The desired BackSeekIndicator.
* @returns {SetMediaClockTimer} - The class instance for method chaining.
*/
setBackSeekIndicator (indicator) {
this._validateType(SeekStreamingIndicator, indicator);
this.setParameter(SetMediaClockTimer.KEY_BACK_SEEK_INDICATOR, indicator);
return this;
}

/**
* Get the BackSeekIndicator
* @returns {SeekStreamingIndicator} - the KEY_BACK_SEEK_INDICATOR value
*/
getBackSeekIndicator () {
return this.getObject(SeekStreamingIndicator, SetMediaClockTimer.KEY_BACK_SEEK_INDICATOR);
}

/**
* Set the CountRate
* @since SmartDeviceLink 7.1.0
* @param {Number} rate - The value of this parameter is the amount that the media clock timer will advance per 1.0 seconds of real time. Values less than 1.0 will therefore advance the timer slower than real-time, while values greater than 1.0 will advance the timer faster than real-time. e.g. If this parameter is set to `0.5`, the timer will advance one second per two seconds real-time, or at 50% speed. If this parameter is set to `2.0`, the timer will advance two seconds per one second real-time, or at 200% speed. - The desired CountRate.
* {'num_min_value': 0.1, 'num_max_value': 100.0}
* {'default_value': 1.0, 'num_min_value': 0.1, 'num_max_value': 100.0}
* @returns {SetMediaClockTimer} - The class instance for method chaining.
*/
setCountRate (rate) {
Expand All @@ -155,6 +196,8 @@ SetMediaClockTimer.KEY_START_TIME = 'startTime';
SetMediaClockTimer.KEY_END_TIME = 'endTime';
SetMediaClockTimer.KEY_UPDATE_MODE = 'updateMode';
SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR = 'audioStreamingIndicator';
SetMediaClockTimer.KEY_FORWARD_SEEK_INDICATOR = 'forwardSeekIndicator';
SetMediaClockTimer.KEY_BACK_SEEK_INDICATOR = 'backSeekIndicator';
SetMediaClockTimer.KEY_COUNT_RATE = 'countRate';

export { SetMediaClockTimer };
93 changes: 93 additions & 0 deletions lib/js/src/rpc/structs/SeekStreamingIndicator.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/* eslint-disable camelcase */
/*
* Copyright (c) 2021, SmartDeviceLink Consortium, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following
* disclaimer in the documentation and/or other materials provided with the
* distribution.
*
* Neither the name of the SmartDeviceLink Consortium Inc. nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/

import { RpcStruct } from '../RpcStruct.js';
import { SeekIndicatorType } from '../enums/SeekIndicatorType.js';

/**
* The seek next / skip previous subscription buttons' content
*/
class SeekStreamingIndicator extends RpcStruct {
/**
* Initalizes an instance of SeekStreamingIndicator.
* @class
* @param {object} parameters - An object map of parameters.
* @since SmartDeviceLink 7.1.0
*/
constructor (parameters) {
super(parameters);
}

/**
* Set the Type
* @param {SeekIndicatorType} type - The desired Type.
* @returns {SeekStreamingIndicator} - The class instance for method chaining.
*/
setType (type) {
this._validateType(SeekIndicatorType, type);
this.setParameter(SeekStreamingIndicator.KEY_TYPE, type);
return this;
}

/**
* Get the Type
* @returns {SeekIndicatorType} - the KEY_TYPE value
*/
getType () {
return this.getObject(SeekIndicatorType, SeekStreamingIndicator.KEY_TYPE);
}

/**
* Set the SeekTime
* @param {Number} time - If the type is TIME, this number of seconds may be present alongside the skip indicator. It will indicate the number of seconds that the currently playing media will skip forward or backward. - The desired SeekTime.
* {'num_min_value': 1, 'num_max_value': 99}
* @returns {SeekStreamingIndicator} - The class instance for method chaining.
*/
setSeekTime (time) {
this.setParameter(SeekStreamingIndicator.KEY_SEEK_TIME, time);
return this;
}

/**
* Get the SeekTime
* @returns {Number} - the KEY_SEEK_TIME value
*/
getSeekTime () {
return this.getParameter(SeekStreamingIndicator.KEY_SEEK_TIME);
}
}

SeekStreamingIndicator.KEY_TYPE = 'type';
SeekStreamingIndicator.KEY_SEEK_TIME = 'seekTime';

export { SeekStreamingIndicator };

0 comments on commit 16fab63

Please sign in to comment.