From 6659f9b14b459e85866e2065a01ca035a26a3e88 Mon Sep 17 00:00:00 2001 From: AKalinich-Luxoft Date: Thu, 3 Aug 2017 13:18:33 +0300 Subject: [PATCH 1/2] Add implementation of radio band ranges switching Added new presets and ranges for AM band. --- app/model/media/RadioModel.js | 462 ++++++++++++++++++++++------------ 1 file changed, 300 insertions(+), 162 deletions(-) diff --git a/app/model/media/RadioModel.js b/app/model/media/RadioModel.js index 35e8841a5..66a23ef74 100755 --- a/app/model/media/RadioModel.js +++ b/app/model/media/RadioModel.js @@ -35,21 +35,15 @@ SDL.RadioModel = Em.Object.create({ init: function() { - var i, - frequency = 87, - fraction = 9; - + var i; this._super(); - for (i = 879; i <= 1079; i++) { - this.directTuneItems.push(i.toString().split('')); + for (i = 879; i <= 1079; i+=2) { + this.directTuneItems.FM.push(i.toString().split('')); + } - if (fraction < 9) { - fraction++; - } else { - frequency++; - fraction = 0; - } + for (i = 525; i <= 1705; i+=5) { + this.directTuneItems.AM.push(i.toString().split('')); } this.updateRadioFrequency(); @@ -101,14 +95,25 @@ SDL.RadioModel = Em.Object.create({ false ], - preset: [ - '87.9', - '90.9', - '105.1', - '98.5', - '106.3', - '107.9' - ], + preset: { + 'FM': [ + '87.9', + '90.9', + '105.1', + '98.5', + '106.3', + '107.9' + ], + 'AM': [ + '650', + '740', + '1190', + '1270', + '1440', + '1530' + ], + 'XM': [] + }, presetMetaData: [ { @@ -155,7 +160,11 @@ SDL.RadioModel = Em.Object.create({ } ], - directTuneItems: [], + directTuneItems: { + 'FM': [], + 'AM': [], + 'XM': [] + }, directTuneKeyItems: [], @@ -185,71 +194,28 @@ SDL.RadioModel = Em.Object.create({ state: 'MULTICAST' }, - getRadioControlCapabilities: function() { - var result = { - moduleName: 'Radio Control Module', - radioEnableAvailable: true, - radioBandAvailable: true, - radioFrequencyAvailable: true, - hdChannelAvailable: true, - rdsDataAvailable: true, - availableHDsAvailable: true, - stateAvailable: true, - signalStrengthAvailable: true, - signalChangeThresholdAvailable: true - }; - - return result; - }, - - getRadioControlData: function() { - var result = { - radioEnable: this.radioControlStruct.radioEnable - }; - - if (result.radioEnable) { - result = { - frequencyInteger: this.radioControlStruct.frequencyInteger, - frequencyFraction: this.radioControlStruct.frequencyFraction, - band: this.radioControlStruct.band, - rdsData: { - PS: this.radioControlStruct.rdsData.PS, - RT: this.radioControlStruct.rdsData.RT, - CT: this.radioControlStruct.rdsData.CT, - PI: this.radioControlStruct.rdsData.PI, - PTY: parseInt(this.radioControlStruct.rdsData.PTY), - TP: this.radioControlStruct.rdsData.TP, - TA: this.radioControlStruct.rdsData.TA, - REG: this.radioControlStruct.rdsData.REG - }, - availableHDs: this.radioControlStruct.availableHDs, - hdChannel: this.radioControlStruct.hdChannel, - signalStrength: parseInt(this.radioControlStruct.signalStrength), - signalChangeThreshold: parseInt( - this.radioControlStruct.signalChangeThreshold - ), - radioEnable: this.radioControlStruct.radioEnable, - state: this.radioControlStruct.state - }; - } - - return result; - }, - - radioZone: { - 'col': 0, - 'row': 0, - 'level': 0, - 'colspan': 2, - 'rowspan': 1, - 'levelspan': 1 - }, - stationsData: { - '1001': { + 'FM': { + '895': { 'radioStation': { - 'frequency': 100, - 'fraction': 1, + 'frequency': 89, + 'fraction': 5, + 'availableHDs': 0, + 'currentHD': 0 + }, + 'songInfo': { + 'name': 'Song1', + 'artist': 'Artist1', + 'genre': 'Genre1', + 'album': 'Album1', + 'year': 2001, + 'duration': 10 + } + }, + '953': { + 'radioStation': { + 'frequency': 95, + 'fraction': 3, 'availableHDs': 0, 'currentHD': 0 }, @@ -262,7 +228,57 @@ SDL.RadioModel = Em.Object.create({ 'duration': 20 } }, - '895': { + '1001': { + 'radioStation': { + 'frequency': 100, + 'fraction': 1, + 'availableHDs': 0, + 'currentHD': 0 + }, + 'songInfo': { + 'name': 'Song3', + 'artist': 'Artist3', + 'genre': 'Genre3', + 'album': 'Album3', + 'year': 2003, + 'duration': 30 + } + }, + '1035': { + 'radioStation': { + 'frequency': 103, + 'fraction': 5, + 'availableHDs': 0, + 'currentHD': 0 + }, + 'songInfo': { + 'name': 'Song4', + 'artist': 'Artist4', + 'genre': 'Genre4', + 'album': 'Album4', + 'year': 2004, + 'duration': 40 + } + }, + '1053': { + 'radioStation': { + 'frequency': 105, + 'fraction': 3, + 'availableHDs': 0, + 'currentHD': 0 + }, + 'songInfo': { + 'name': 'Song5', + 'artist': 'Artist5', + 'genre': 'Genre5', + 'album': 'Album5', + 'year': 2005, + 'duration': 50 + } + } + }, + 'AM': { + '550': { 'radioStation': { 'frequency': 89, 'fraction': 5, @@ -278,13 +294,29 @@ SDL.RadioModel = Em.Object.create({ 'duration': 10 } }, - '953': { + '650': { 'radioStation': { 'frequency': 95, 'fraction': 3, 'availableHDs': 0, 'currentHD': 0 }, + 'songInfo': { + 'name': 'Song2', + 'artist': 'Artist2', + 'genre': 'Genre2', + 'album': 'Album2', + 'year': 2002, + 'duration': 20 + } + }, + '800': { + 'radioStation': { + 'frequency': 100, + 'fraction': 1, + 'availableHDs': 0, + 'currentHD': 0 + }, 'songInfo': { 'name': 'Song3', 'artist': 'Artist3', @@ -294,7 +326,7 @@ SDL.RadioModel = Em.Object.create({ 'duration': 30 } }, - '1035': { + '1095': { 'radioStation': { 'frequency': 103, 'fraction': 5, @@ -310,7 +342,7 @@ SDL.RadioModel = Em.Object.create({ 'duration': 40 } }, - '1053': { + '1450': { 'radioStation': { 'frequency': 105, 'fraction': 3, @@ -327,6 +359,9 @@ SDL.RadioModel = Em.Object.create({ } } }, + 'XM': { + } + }, radioDetails: { radioStation: { @@ -398,6 +433,57 @@ SDL.RadioModel = Em.Object.create({ statusBar: 'FM Radio', + getRadioControlCapabilities: function() { + var result = { + moduleName: 'Radio Control Module', + radioEnableAvailable: true, + radioBandAvailable: true, + radioFrequencyAvailable: true, + hdChannelAvailable: true, + rdsDataAvailable: true, + availableHDsAvailable: true, + stateAvailable: true, + signalStrengthAvailable: true, + signalChangeThresholdAvailable: true + }; + + return result; + }, + + getRadioControlData: function() { + var result = { + radioEnable: this.radioControlStruct.radioEnable + }; + + if (result.radioEnable) { + result = { + frequencyInteger: this.radioControlStruct.frequencyInteger, + frequencyFraction: this.radioControlStruct.frequencyFraction, + band: this.radioControlStruct.band, + rdsData: { + PS: this.radioControlStruct.rdsData.PS, + RT: this.radioControlStruct.rdsData.RT, + CT: this.radioControlStruct.rdsData.CT, + PI: this.radioControlStruct.rdsData.PI, + PTY: parseInt(this.radioControlStruct.rdsData.PTY), + TP: this.radioControlStruct.rdsData.TP, + TA: this.radioControlStruct.rdsData.TA, + REG: this.radioControlStruct.rdsData.REG + }, + availableHDs: this.radioControlStruct.availableHDs, + hdChannel: this.radioControlStruct.hdChannel, + signalStrength: parseInt(this.radioControlStruct.signalStrength), + signalChangeThreshold: parseInt( + this.radioControlStruct.signalChangeThreshold + ), + radioEnable: this.radioControlStruct.radioEnable, + state: this.radioControlStruct.state + }; + } + + return result; + }, + setRadioData: function(data) { var properties = []; @@ -519,8 +605,9 @@ SDL.RadioModel = Em.Object.create({ }, saveStationToPreset: function(element) { + var band = this.radioControlStruct.band; element.set('text', this.station); - this.preset[element.preset] = this.station; + this.preset[band][element.preset] = this.station; SDL.RadioModel.set('activePreset', element.preset); //FFW.RC.OnPresetsChanged(this.preset); @@ -533,6 +620,8 @@ SDL.RadioModel = Em.Object.create({ } else { this.set('station', this.temp); this.set('directTuneFinished', false); + this.set('directTuneKeypressed', false); + this.set('directTuneKeyItems', []); } }, @@ -586,23 +675,27 @@ SDL.RadioModel = Em.Object.create({ updateRadioFrequency: function(params) { if (params) { if (params.frequency != null) { - this.set('radioControlStruct.frequencyInteger', params.frequency); + this.setFrequencyInteger(params.frequency); } if (params.fraction != null) { - this.set('radioControlStruct.frequencyFraction', params.fraction); + this.setFrequencyFraction(params.fraction); } if (params.availableHDs != null) { - this.set('radioControlStruct.availableHDs', params.availableHDs); + this.setAvailableHDs(params.availableHDs); } if (params.currentHD != null) { - this.set('radioControlStruct.currentHD', params.currentHD); + this.setCurrentHdChannel(params.currentHD); } } - this.set('station', - this.radioControlStruct.frequencyInteger + '.' + - this.radioControlStruct.frequencyFraction - ); + if (this.radioControlStruct.band === 'FM') { + this.set('station', + this.radioControlStruct.frequencyInteger + '.' + + this.radioControlStruct.frequencyFraction + ); + } else { + this.set('station', this.radioControlStruct.frequencyInteger); + } this.findStationPresets(); }, @@ -615,19 +708,19 @@ SDL.RadioModel = Em.Object.create({ */ directTuneKeys: function() { var i, keys = []; + var band = this.radioControlStruct.band; - for (i = 0; i < this.directTuneItems.length; i++) { + for (i = 0; i < this.directTuneItems[band].length; i++) { if (this.directTuneKeyItems.toString() === - this.directTuneItems[i].slice(0, this.directTuneKeyItems.length). - toString()) { - keys.push( - Number(this.directTuneItems[i][this.directTuneKeyItems.length]) - ); - - // Set true if find station - if (this.directTuneKeyItems.length === this.directTuneItems[i].length) { - this.set('directTuneFinished', true); - } + this.directTuneItems[band][i].slice(0, this.directTuneKeyItems.length).toString()) { + keys.push( + Number(this.directTuneItems[band][i][this.directTuneKeyItems.length]) + ); + + // Set true if find station + if (this.directTuneKeyItems.length === this.directTuneItems[band][i].length) { + this.set('directTuneFinished', true); + } } } @@ -635,17 +728,21 @@ SDL.RadioModel = Em.Object.create({ }.property('this.directTuneKeyItems.@each'), setStation: function(element) { - this.set('station', this.preset[element.preset]); + var band = this.radioControlStruct.band; + var data = this.preset[band][element.preset]; + + if (this.radioControlStruct.band === 'FM') { + this.setFrequencyInteger(parseInt(data.slice(0, -1))); + this.setFrequencyFraction(parseInt(data.slice(-1))); + } else { + this.setFrequencyInteger(parseInt(data)); + } + + data = this.changeFrequency(0); + this.updateRadioFrequency(); + this.checkRadioDetailsSongInfo(data); SDL.RadioModel.set('activePreset', element.preset); - SDL.RadioModel.set('radioControlStruct.frequencyInteger', - parseInt(SDL.RadioModel.station.slice(0, -1)) - ); - SDL.RadioModel.set('radioControlStruct.frequencyFraction', - parseInt(SDL.RadioModel.station.slice(-1)) - ); - this.sendRadioChangeNotification( - ['frequencyInteger', 'frequencyFraction']); }, tuneRadioStation: function(element) { @@ -654,29 +751,29 @@ SDL.RadioModel = Em.Object.create({ this.set('station', ''); } - if (this.station < 108 && !isNaN(element.preset)) { + var max_range = + this.radioControlStruct.band == 'FM' ? 108 : 1710; + if (this.station < max_range && !isNaN(element.preset)) { this.set('station', this.station + element.preset); this.directTuneKeyItems.pushObject(element.preset); } - if (element.preset == 'Enter' && SDL.RadioModel.station.indexOf('.') < 0) { - SDL.RadioModel.set('station', SDL.RadioModel.station.slice(0, -1) + '.' + - SDL.RadioModel.station.slice(-1) - ); - SDL.RadioModel.set('radioControlStruct.frequencyInteger', - parseInt(SDL.RadioModel.station.slice(0, -1)) - ); - SDL.RadioModel.set('radioControlStruct.frequencyFraction', - parseInt(SDL.RadioModel.station.slice(-1)) - ); + if (element.preset == 'Enter') { + var data = this.station; + if (this.radioControlStruct.band === 'FM') { + this.setFrequencyInteger(parseInt(data.slice(0, -1))); + this.setFrequencyFraction(parseInt(data.slice(-1))); + } else { + this.setFrequencyInteger(parseInt(data)); + } + + data = this.changeFrequency(0); + this.updateRadioFrequency(); + this.checkRadioDetailsSongInfo(data); + this.set('temp', this.station); this.set('directTuneFinished', false); this.set('directTuneKeypressed', false); this.set('directTuneKeyItems', []); - - this.findStationPresets(); - - this.sendRadioChangeNotification( - ['frequencyInteger', 'frequencyFraction']); } if (element.preset == 'X') { SDL.RadioModel.set('station', SDL.RadioModel.station.slice(0, -1)); @@ -751,8 +848,8 @@ SDL.RadioModel = Em.Object.create({ }, radioTune: function(params) { - this.radioControlStruct.frequencyInteger = params.radioStation.frequency; - this.radioControlStruct.frequencyFraction = params.radioStation.fraction; + this.setFrequencyInteger(params.radioStation.frequency); + this.setFrequencyFraction(params.radioStation.fraction); this.set('station', this.radioControlStruct.frequencyInteger + '.' + this.radioControlStruct.frequencyFraction @@ -772,45 +869,64 @@ SDL.RadioModel = Em.Object.create({ this.tuneDown(); }, - tuneUp: function() { - //FFW.CAN.TuneUp('step_up'); + changeFrequency(incement) { + if (this.radioControlStruct.band === 'FM') { var data = this.radioControlStruct.frequencyFraction + - this.radioControlStruct.frequencyInteger * 10; + this.radioControlStruct.frequencyInteger * 10; - data += 2; + if (incement > 0) { + data += 2; + } else if (incement < 0) { + data -= 2; + } - if (data >= 1080) { + if (data > 1079) { data = 879; + } else if (data < 879) { + data = 1079 } - this.set('radioControlStruct.frequencyInteger', Math.floor(data / 10)); - this.set('radioControlStruct.frequencyFraction', data % 10); + this.setFrequencyInteger(Math.floor(data / 10)); + this.setFrequencyFraction(data % 10); - this.updateRadioFrequency(); - this.checkRadioDetailsSongInfo(data); - }, - - tuneDown: function() { - //FFW.CAN.TuneDown('step_down'); - var data = this.radioControlStruct.frequencyFraction + - this.radioControlStruct.frequencyInteger * 10; + return data; + } else { + var data = this.radioControlStruct.frequencyInteger; - data -= 2; + if (incement > 0) { + data += 5; + } else if (incement < 0) { + data -= 5; + } - if (data <= 877) { - data = 1079; + if (data > 1705) { + data = 525; + } else if (data < 525) { + data = 1705; } - this.set('radioControlStruct.frequencyInteger', Math.floor(data / 10)); - this.set('radioControlStruct.frequencyFraction', data % 10); + this.setFrequencyInteger(data); + this.setFrequencyFraction(0); + + return data; + } + }, + tuneUp: function() { + var data = this.changeFrequency(1); this.updateRadioFrequency(); this.checkRadioDetailsSongInfo(data); }, - checkRadioDetailsSongInfo: function(data) { + tuneDown: function() { + var data = this.changeFrequency(-1); + this.updateRadioFrequency(); + this.checkRadioDetailsSongInfo(data); + }, - if (this.stationsData[data]) { + checkRadioDetailsSongInfo: function(data) { + var band = this.radioControlStruct.band; + if (this.stationsData[band][data]) { if (this.tuneUpTimer != null) { clearInterval(this.tuneUpTimer); this.tuneUpTimer = null; @@ -826,20 +942,28 @@ SDL.RadioModel = Em.Object.create({ }, 2000 ); } - this.updateSongInfo(this.stationsData[data].songInfo); + this.updateSongInfo(this.stationsData[band][data].songInfo); + } else { + this.updateSongInfo(); } - this.sendRadioChangeNotification( - ['frequencyInteger', 'frequencyFraction']); + if (this.radioControlStruct.band === 'FM') { + this.sendRadioChangeNotification( + ['frequencyInteger', 'frequencyFraction'] + ); + } else { + this.sendRadioChangeNotification(['frequencyInteger']); + } }, findStationPresets: function() { var i = 0; + var band = this.radioControlStruct.band; this.set('activePreset', null); - for (i; i < this.preset.length; i++) { - if (this.station == this.preset[i]) { + for (i; i < this.preset[band].length; i++) { + if (this.station == this.preset[band][i]) { this.set('activePreset', i); break; } @@ -861,6 +985,20 @@ SDL.RadioModel = Em.Object.create({ var afterChange = this.lastOptionParams; var properties = this.getChangedProperties(beforeChange, afterChange); + if (properties.indexOf('band') >= 0) { + if (this.radioControlStruct.band === 'FM') { + this.setFrequencyInteger(87); + this.setFrequencyFraction(9); + } else { + this.setFrequencyInteger(540); + } + this.set('statusBar', this.radioControlStruct.band + ' Radio'); + + var data = this.changeFrequency(0); + this.updateRadioFrequency(); + this.checkRadioDetailsSongInfo(data); + } + SDL.RadioModel.toggleProperty('optionsEnabled'); this.sendRadioChangeNotification(properties); }, From 851f7c7dd4e07154ae3ac33f0652a4201ae392cc Mon Sep 17 00:00:00 2001 From: AKalinich-Luxoft Date: Thu, 3 Aug 2017 13:19:35 +0300 Subject: [PATCH 2/2] Updated UI in radio and home view to display correct presets --- app/view/home/widgetMediaView.js | 48 ++++++++++++++++++++++++++---- app/view/media/player/radioView.js | 48 ++++++++++++++++++++++++++---- locale/eng.js | 2 +- 3 files changed, 85 insertions(+), 13 deletions(-) diff --git a/app/view/home/widgetMediaView.js b/app/view/home/widgetMediaView.js index 4e82b1898..06b4b5c8a 100755 --- a/app/view/home/widgetMediaView.js +++ b/app/view/home/widgetMediaView.js @@ -121,7 +121,13 @@ SDL.WidgetMediaView = Em.ContainerView.extend({ 1: SDL.RadioPresetButton.extend({ elementId: 'radio_media_home_preset_button1', classNames: 'a0', - textBinding: 'SDL.RadioModel.preset.0', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][0]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', homePreset: true, preset: 0, @@ -131,7 +137,13 @@ SDL.WidgetMediaView = Em.ContainerView.extend({ 2: SDL.RadioPresetButton.extend({ elementId: 'radio_media_home_preset_button2', classNames: 'a1', - textBinding: 'SDL.RadioModel.preset.1', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][1]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', homePreset: true, preset: 1, @@ -141,7 +153,13 @@ SDL.WidgetMediaView = Em.ContainerView.extend({ 3: SDL.RadioPresetButton.extend({ elementId: 'radio_media_home_preset_button3', classNames: 'a2', - textBinding: 'SDL.RadioModel.preset.2', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][2]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', homePreset: true, preset: 2, @@ -151,7 +169,13 @@ SDL.WidgetMediaView = Em.ContainerView.extend({ 4: SDL.RadioPresetButton.extend({ elementId: 'radio_media_home_preset_button4', classNames: 'a3', - textBinding: 'SDL.RadioModel.preset.3', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][3]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', homePreset: true, preset: 3, @@ -161,7 +185,13 @@ SDL.WidgetMediaView = Em.ContainerView.extend({ 5: SDL.RadioPresetButton.extend({ elementId: 'radio_media_home_preset_button5', classNames: 'a4', - textBinding: 'SDL.RadioModel.preset.4', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][4]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', homePreset: true, preset: 4, @@ -171,7 +201,13 @@ SDL.WidgetMediaView = Em.ContainerView.extend({ 6: SDL.RadioPresetButton.extend({ elementId: 'radio_media_home_preset_button6', classNames: 'a5', - textBinding: 'SDL.RadioModel.preset.5', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][5]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', homePreset: true, preset: 5, diff --git a/app/view/media/player/radioView.js b/app/view/media/player/radioView.js index 7cd4cfdc0..22cd8848f 100755 --- a/app/view/media/player/radioView.js +++ b/app/view/media/player/radioView.js @@ -477,7 +477,13 @@ SDL.RadioView = Em.ContainerView disabled: true, elementId: 'radio_media_preset_button1', classNames: 'a0', - textBinding: 'SDL.RadioModel.preset.0', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][0]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', preset: 0, presetName: 'PRESET_1' @@ -494,7 +500,13 @@ SDL.RadioView = Em.ContainerView disabled: true, elementId: 'radio_media_preset_button2', classNames: 'a1', - textBinding: 'SDL.RadioModel.preset.1', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][1]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', preset: 1, presetName: 'PRESET_2' @@ -511,7 +523,13 @@ SDL.RadioView = Em.ContainerView disabled: true, elementId: 'radio_media_preset_button3', classNames: 'a2', - textBinding: 'SDL.RadioModel.preset.2', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][2]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', preset: 2, presetName: 'PRESET_3' @@ -528,7 +546,13 @@ SDL.RadioView = Em.ContainerView disabled: true, elementId: 'radio_media_preset_button4', classNames: 'a3', - textBinding: 'SDL.RadioModel.preset.3', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][3]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', preset: 3, presetName: 'PRESET_4' @@ -545,7 +569,13 @@ SDL.RadioView = Em.ContainerView disabled: true, elementId: 'radio_media_preset_button5', classNames: 'a4', - textBinding: 'SDL.RadioModel.preset.4', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][4]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', preset: 4, presetName: 'PRESET_5' @@ -562,7 +592,13 @@ SDL.RadioView = Em.ContainerView disabled: true, elementId: 'radio_media_preset_button6', classNames: 'a5', - textBinding: 'SDL.RadioModel.preset.5', + getPresetText: function() { + var band = SDL.RadioModel.radioControlStruct.band; + return SDL.RadioModel.preset[band][5]; + }.property( + 'SDL.RadioModel.radioControlStruct.band' + ), + textBinding: 'getPresetText', templateName: 'text', preset: 5, presetName: 'PRESET_6' diff --git a/locale/eng.js b/locale/eng.js index aee873471..bf7b29a11 100644 --- a/locale/eng.js +++ b/locale/eng.js @@ -46,7 +46,7 @@ SDL.eng = { view_info_leftmenu_alerts: 'Alerts', view_info_leftmenu_calendar: 'Calendar', view_info_leftmenu_apps: 'Apps', - view_media_radio: 'FM', + view_media_radio: 'Radio', view_media_cd: 'CD', view_media_usb: 'USB', view_phone_dial: 'Dial',