#22 / #33 fix - updates from page/playlist number on OSC changes with…

… Songbeamer 6.04a

src/actions.js

@@ -349,24 +349,6 @@ export function getActionDefinitions(self, osc) {
 					'debug',
 					`Sent OSC to ${self.config.host}:${self.config.port} with ${path} and ${JSON.stringify(args)}`
 				)
-				// Remove the following lines once propper feedback is implemented in songbeamer - see #22
-				self.log(
-					'info',
-					'Songbeamer OSC implementation is missing feedback for page/playlist changes #22 manually requesting variables'
-				)
-				self.log('info', 'Songbeamer OSC reports wrong page numbers after update via OSC #30')
-				osc.send({
-					address: '/playlist/itemindex',
-					args: [],
-				})
-				osc.send({
-					address: '/presentation/page',
-					args: [],
-				})
-				osc.send({
-					address: '/presentation/presentation_pagecount',
-					args: [],
-				})
 			},
 		},
 		video_state: {

src/main.js

@@ -146,6 +146,10 @@ class SongbeamerInstance extends InstanceBase {
 					this.setVariableValues({ presentation_page: value })
 					this.checkFeedbacks('presentation_page')
 					break
+				case '/presentation/nextpage':
+				case '/presentation/prevpage':
+					this.log('debug', `/presentation/nextpage or /presentation/nextpage ${value}`)
+					break
 				case '/presentation/pagecount':
 					this.log('debug', `/presentation/pagecount ${value}`)
 					this.setVariableValues({ presentation_pagecount: value })
@@ -177,6 +181,10 @@ class SongbeamerInstance extends InstanceBase {
 					this.setVariableValues({ playlist_itemindex: value + 1 })
 					this.checkFeedbacks('playlist_itemindex')
 					break
+				case '/playlist/previous':
+				case '/playlist/next':
+					this.log('debug', `/playlist/previous or /playlist/next ${value}`)
+					break
 				case '/playlist/count':
 					this.log('warn', `/playlist/count ${value} not yet implemented`)
 					break
@@ -219,6 +227,7 @@ class SongbeamerInstance extends InstanceBase {
 		 */
 		this.osc.on('ready', () => {
 			this.log('info', 'OSC port is in "ready" state')
+			self.osc_update_polling()
 			this.heartbeat = setInterval(function () {
 				self.osc_update_polling()
 			}, 9500) // just before 10 sec expiration