[Netlinx-modules-commit] NetLinx-Modules/SlimServer CHANGES-FR.txt,NONE,1.1 CHANGES.txt,NONE,1.1 REA

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/netlinx-modules/NetLinx-Modules/SlimServer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13139

Modified Files:
	Main-Sample.axs README.txt SlimServer,MVP-8400.TP4 
	SlimServer,VPN-CP.tpd SlimServerMod.axi 
Added Files:
	CHANGES-FR.txt CHANGES.txt README-FR.txt SlimServerMod-FR.sxw 
	SlimServerMod.axs SlimServerMod.sxw 
Log Message:
Update all files for SlimServerMod v1.0 release

--- NEW FILE: SlimServerMod-FR.sxw ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: CHANGES-FR.txt ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: SlimServerMod.axs ---
MODULE_NAME='SlimServerMod' (
    dev dvSlimServer,		// Physical SlimServer TCP/IP connection
    dev vdSlimServer,		// Logical connection to SlimServer module
    char sIPAddr[],		// TCP/IP DNS name (or IP address) of SlimServer
    char sUnitAddr[][],		// TCP/IP Address or MAC address of SqueezeBox units
    dev vdSyslog,		// Virtual device for Syslog
    char llSlimServer[]		// SlimServer Syslog Logging Level
)

(*{{PS_SOURCE_INFO(PROGRAM STATS)                          *)
(***********************************************************)
(*  FILE CREATED ON: 10/03/2004 AT: 09:00:00               *)
(***********************************************************)
(*  FILE_LAST_MODIFIED_ON: 04/24/2005  AT: 16:52:56        *)
(***********************************************************)
(*  ORPHAN_FILE_PLATFORM: 1                                *)
(***********************************************************)
(*!!FILE REVISION: Rev 0                                   *)
(*  REVISION DATE: 10/03/2004                              *)
[...2811 lines suppressed...]
	}

	if (fPanelUpdated) {
	    fUpdateVD = TRUE;
	    UpdatePanel(loop, FALSE);
	}
    }

    if (fUpdateVD)
	UpdateVirtualDevice();
}

(***********************************************************)
(*            THE ACTUAL PROGRAM GOES BELOW                *)
(***********************************************************)
DEFINE_PROGRAM

// Notify if we're currently doing some sort of communicaiton to SlimServer
if (Fdbk_Connected.channel)
    [Fdbk_Connection_Busy] = (Q_HasItems || length_array(sLastCommand) <> 0);

Index: Main-Sample.axs
===================================================================
RCS file: /cvsroot/netlinx-modules/NetLinx-Modules/SlimServer/Main-Sample.axs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Main-Sample.axs	7 Apr 2005 20:47:40 -0000	1.1
--- Main-Sample.axs	28 Jul 2005 21:54:20 -0000	1.2
***************
*** 5,9 ****
  (*  FILE CREATED ON: 08/19/2000 AT: 12:35:12               *)
  (***********************************************************)
! (*  FILE_LAST_MODIFIED_ON: 04/02/2005  AT: 14:38:31        *)
  (***********************************************************)
  (*  ORPHAN_FILE_PLATFORM: 1                                *)
--- 5,9 ----
  (*  FILE CREATED ON: 08/19/2000 AT: 12:35:12               *)
  (***********************************************************)
! (*  FILE_LAST_MODIFIED_ON: 05/03/2005  AT: 17:31:50        *)
  (***********************************************************)
  (*  ORPHAN_FILE_PLATFORM: 1                                *)
***************
*** 49,57 ****

  #if_defined USING_MODERO_PANEL
! TP_Setup	= 10001:1:1;		// Family Room - Souce Select
! TP_SServer	= 10001:9:1;		// Family Room - Source: SlimServer
  #else
! TP_Setup	= 198:1:1;		// Family Room - Souce Select
! TP_SServer	= 200:1:1;		// Family Room - Source: SlimServer
  #end_if

--- 49,57 ----

  #if_defined USING_MODERO_PANEL
! TP_Setup	= 10001:1:0;		// Family Room - Souce Select
! TP_SServer	= 10001:9:0;		// Family Room - Source: SlimServer
  #else
! TP_Setup	= 198:1:0;		// Family Room - Souce Select
! TP_SServer	= 200:1:0;		// Family Room - Source: SlimServer
  #end_if

***************
*** 78,82 ****
  char SlimS_Unit_Family	= 1;	//	First Unit:	Family Room
  char SlimS_Unit_Boys	= 2;	//	Second Unit:	Boys Room
! char SlimS_Unit_Test	= 3;	//	Third Unit:	Test Unit (SoftSqueeze)

  // Set up generic arrays of all touch panels in the system
--- 78,82 ----
  char SlimS_Unit_Family	= 1;	//	First Unit:	Family Room
  char SlimS_Unit_Boys	= 2;	//	Second Unit:	Boys Room
! char SlimS_Unit_Test	= 3;	//	Third Unit:	Guest Room

  // Set up generic arrays of all touch panels in the system
***************
*** 115,126 ****
  volatile char sSlimServer_Addr[] = 'slimserver.taltos.com';
  volatile char sSlimServer_Units[SlimS_Unit_Count][SS_MAX_PlayerID] =
!     { 	'00:04:20:05:69:dc',		// SqueezeBox: Family Room
! 	'00:04:20:05:69:5e',		// SqueezeBox: Boys Room
! 	'06:20:83:7f:fe:07' };		// SoftSqueeze: Test Unit

  volatile char SlimServer_fDebugFeedback = 0;
  volatile char g_SlimServer_UnitNum;	// Global - Current SlimServer unit # we're controlling
  volatile char SServer_BScroll[SS_MAX_BrowseSessions], SServer_LastLev[SS_MAX_BrowseSessions];
! 					// Flag to indicate if browse scroll bar currently being adjusted

  (***********************************************************)
--- 115,126 ----
  volatile char sSlimServer_Addr[] = 'slimserver.taltos.com';
  volatile char sSlimServer_Units[SlimS_Unit_Count][SS_MAX_PlayerID] =
!     { 	'00:04:20:05:a2:e1',		// SqueezeBox: Family Room
! 	'00:04:20:05:a2:e3',		// SqueezeBox: Boys Room
! 	'00:04:20:05:a2:e5' };		// SqueezeBox: Guest Room

  volatile char SlimServer_fDebugFeedback = 0;
  volatile char g_SlimServer_UnitNum;	// Global - Current SlimServer unit # we're controlling
  volatile char SServer_BScroll[SS_MAX_BrowseSessions], SServer_LastLev[SS_MAX_BrowseSessions];
! 					// Flags to indicate if browse scroll bar currently being adjusted

  (***********************************************************)
***************
*** 142,145 ****
--- 142,149 ----
  DEFINE_FUNCTION PlayerStart (char unitNum)
  {
+     // To start a particular player, we must:
+     //   Turn on the power to the player (if already on, this is harmless)
+     //   Inform module that we want player feedback on the touchpanel
+ 
      dev panelList[SS_MAX_PanelsInSystem];

***************
*** 154,165 ****
  }

! DEFINE_FUNCTION PlayerStop
  {
      // Disable updates for this unit (MUST be done before monitoring another Squeezebox!)
      SS_SetPanels(vdSlimServer, g_SlimServer_UnitNum, SS_noPanelList);

!     // If desired, you can do the following to stop and turn off the player
!     SS_DoCommand(vdSlimServer, g_SlimServer_UnitNum, SS_cmdStop);
!     SS_DoCommand(vdSlimServer, g_SlimServer_UnitNum, SS_cmdPower_Off);

      g_SlimServer_UnitNum = 0;
--- 158,178 ----
  }

! DEFINE_FUNCTION PlayerStop (char fStopPlayer)
  {
+     // This is an example only; you may want to do this when powering off (for example)
+     // When we deselect a player (i.e. stop monitoring it from the touchpanel, we):
+     //   Disable panel updates (stop updating touchpanel for this player)
+     //   Issue a "stop" command (to kill off any transcoding for player on server)
+     //   Turn off power to the player
+     //   Set "player number" to zero (i.e. no player being controlled at this time)
+ 
      // Disable updates for this unit (MUST be done before monitoring another Squeezebox!)
      SS_SetPanels(vdSlimServer, g_SlimServer_UnitNum, SS_noPanelList);

!     if (fStopPlayer) {
! 	// If desired, you can do the following to stop and turn off the player
! 	SS_DoCommand(vdSlimServer, g_SlimServer_UnitNum, SS_cmdStop);
! 	SS_DoCommand(vdSlimServer, g_SlimServer_UnitNum, SS_cmdPower_Off);
!     }

      g_SlimServer_UnitNum = 0;
***************
*** 209,213 ****
  	}
  	Active (remove_string(data.text,'KEYP-',1) <> ''): {
! 	    SS_DoExtCommand (vdSlimServer, g_SlimServer_UnitNum, SS_extCmdSleep, 0, atoi(data.text));
  	}
      }
--- 222,238 ----
  	}
  	Active (remove_string(data.text,'KEYP-',1) <> ''): {
! 	    char strHH[16];
! 	    slong slTime;
! 
! 	    // Include hours if they are specified
! 	    slTime = 0;
! 	    strHH = remove_string(data.text,':',1);
! 	    if (length_string(strHH) <> 0)
! 		sltime = atoi(strHH) * 60;
! 
! 	    // Add in any remaining minutes
! 	    slTime = slTime + atoi(data.text);
! 
! 	    SS_DoExtCommand (vdSlimServer, g_SlimServer_UnitNum, SS_extCmdSleep, 0, slTime);
  	}
      }
***************
*** 215,219 ****
  }

! // Source selection buttons

  button_event [TP_Setup, 11]		// Select Squeezebox in Family Room
--- 240,244 ----
  }

! // Source selection buttons - Select which sqeezebox will be controlled

  button_event [TP_Setup, 11]		// Select Squeezebox in Family Room
***************
*** 229,233 ****
  }

! button_event [TP_Setup, 13]		// Select test player (SoftSqueeze)
  {
  PUSH:
--- 254,258 ----
  }

! button_event [TP_Setup, 13]		// Select Squeezebox in Guest Room
  {
  PUSH:
***************
*** 235,242 ****
  }

! button_event [TP_Setup, 20]		// Stop playing current Squeezebox
  {
  PUSH:
!     PlayerStop();
  }

--- 260,267 ----
  }

! button_event [TP_Setup, 20]		// Stop monitoring current Squeezebox
  {
  PUSH:
!     PlayerStop(FALSE);
  }

***************
*** 253,258 ****
      switch (data.text[1]) {
  	case SS_Pkt_UI_Error: {
! 	    // Got some sort of error feedback from the SlimServer (beep panels)
! 	    send_command TP_SServer, 'ADBEEP';
  	}
      }
--- 278,294 ----
      switch (data.text[1]) {
  	case SS_Pkt_UI_Error: {
! 	    sinteger slResult;
! 	    _sSS_UI_ErrorResult errData;
! 	    slResult = SS_UI_DecodeErrPacket(errData, data.text);
! 
! 	    if (slResult == 0 && errData.panel.number <> 0) {
! 		send_command errData.panel, "'!T',9,errData.errText";
! 		send_command errData.panel, 'ADBEEP';
! 		send_command errData.panel, 'PPON-SlimServer Warning';
! 	    }
! 	    else {
! 		// Got some sort of error feedback - not clear where error came from (beep all panels)
! 		send_command TP_SServer, 'ADBEEP';
! 	    }
  	}
      }
***************
*** 264,275 ****
  channel_event[vdSlimServer, 1]				// Online/Offline changes
  {
! on:	on[TP_SServer,256];
! off:	off[TP_SServer,256];
  }

  channel_event[vdSlimServer, 2]				// Idle/Busy changes
  {
! on:	on[TP_SServer,257];
! off:	off[TP_SServer,257];
  }

--- 300,311 ----
  channel_event[vdSlimServer, 1]				// Online/Offline changes
  {
! on:	on[TP_SServer,254];
! off:	off[TP_SServer,254];
  }

  channel_event[vdSlimServer, 2]				// Idle/Busy changes
  {
! on:	on[TP_SServer,255];
! off:	off[TP_SServer,255];
  }

***************
*** 283,293 ****
      if (g_SlimServer_UnitNum == SlimS_Unit_Family) {
  	// Squeezebox stopped playing; shutdown in 1 minute
! 	wait 600 'SlimS_Unit_Family_Shutdown'
! 	    PlayerStop();
      }
  }
  }

! Button_Event [TP_SServer,GenericChans]	// Modero SlimServer Handler
  {
  PUSH:
--- 319,333 ----
      if (g_SlimServer_UnitNum == SlimS_Unit_Family) {
  	// Squeezebox stopped playing; shutdown in 1 minute
! 	wait 600 'SlimS_Unit_Family_Shutdown' {
! 	    // Keep touchpanel up to date to not confuse end user
! 	    send_command TP_SServer, 'Page-Source Select';
! 	    // Now tell the player to stop and turn off
! 	    PlayerStop(TRUE);
! 	}
      }
  }
  }

! Button_Event [TP_SServer,GenericChans]	// SlimServer Handler: Generic commands
  {
  PUSH:
***************
*** 295,299 ****
  }

! Button_Event [TP_SServer,128]
  {
  PUSH:
--- 335,339 ----
  }

! Button_Event [TP_SServer,128]		// SlimServer: Force panel update
  {
  PUSH:
***************
*** 301,305 ****
  }

! button_event [TP_SServer,129]		// Modero SlimServer: Extended Debugging Output
  {
  PUSH: {
--- 341,345 ----
  }

! button_event [TP_SServer,129]		// SlimServer: Extended Debugging Output
  {
  PUSH: {
***************
*** 313,324 ****
  }

! Button_Event [TP_SServer,130]		// Modero SlimServer: Deselect Browse Session
  {
  PUSH: {
!     // If you have a queue of available browse sessions, add this session here
  }
  }

! Button_Event [TP_SServer,131]		// Modero SlimServer: Select Songs (Select Browse Session)
  {
  PUSH:
--- 353,364 ----
  }

! Button_Event [TP_SServer,130]		// SlimServer: Deselect Browse Session
  {
  PUSH: {
!     // If you have a queue of available browse sessions, remove this session here
  }
  }

! Button_Event [TP_SServer,131]		// SlimServer: Select Songs (Select Browse Session)
  {
  PUSH:
***************
*** 328,332 ****
  }

! Button_Event [TP_SServer,132]		// Modero SlimServer: Back up one level
  {
  PUSH:
--- 368,372 ----
  }

! Button_Event [TP_SServer,132]		// SlimServer: Back up one level
  {
  PUSH:
***************
*** 334,338 ****
  }

! Button_Event [TP_SServer,133]		// Modero SlimServer: Scroll back one page
  {
  PUSH:
--- 374,378 ----
  }

! Button_Event [TP_SServer,133]		// SlimServer: Scroll back one page
  {
  PUSH:
***************
*** 343,347 ****
  }

! Button_Event [TP_SServer,134]		// Modero SlimServer: Scroll forward one page
  {
  PUSH:
--- 383,387 ----
  }

! Button_Event [TP_SServer,134]		// SlimServer: Scroll forward one page
  {
  PUSH:
***************
*** 352,356 ****
  }

! button_event [TP_SServer,138]		// Modero SlimServer: Enter sleep time
  {
  PUSH: {
--- 392,396 ----
  }

! button_event [TP_SServer,138]		// SlimServer: Enter sleep time
  {
  PUSH: {
***************
*** 359,363 ****
  }

! Button_Event [TP_SServer,139]		// Modero SlimServer: Search current items
  {
  PUSH: {
--- 399,403 ----
  }

! Button_Event [TP_SServer,SS_Channel_Search]  // SlimServer: Search current items
  {
  PUSH: {
***************
*** 372,376 ****

  Button_Event [TP_SServer,SS_Channels_Items]
! 					// Modero SlimServer: Select item (drill down)
  {
  PUSH:
--- 412,416 ----

  Button_Event [TP_SServer,SS_Channels_Items]
! 					// SlimServer: Select item (drill down)
  {
  PUSH:
***************
*** 379,383 ****

  Button_Event [TP_SServer,SS_Channels_Add]
! 					// Modero SlimServer: Add item to queue
  {
  PUSH: {
--- 419,423 ----

  Button_Event [TP_SServer,SS_Channels_Add]
! 					// SlimServer: Add item to queue
  {
  PUSH: {
***************
*** 400,404 ****
  }

! level_event [TP_SServer,5]
  {
      // Save the last level, set flag to indicate we've set the level
--- 440,444 ----
  }

! level_event [TP_SServer,8]
  {
      // Save the last level, set flag to indicate we've set the level

--- NEW FILE: README-FR.txt ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: SlimServerMod.sxw ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: CHANGES.txt ---
2005-05-16: Updated VPN-CP panel layout for "feedback" state (and colors) on primary screen and selection screen.  There was no visual feedback on which button was touched.

2005-05-15: Updated README file, released V1.0 (final release).

2005-05-15: Fixed minor problem in VPN-CP panel layout (no channel assignment for sleep button).  No effect on the sample code, but breaks potential implementation if panel is imported into an existing system.

2005-05-03: Incorporated new VPN-CP panel layout.  Modified feedback channels for ONLINE/OFFLINE and IDLE/BUSY to be compatible with both the VPN-CP panel layout and the MVP-8400 panel layout (mainline change).  Tested both the VPN-CP and MVP-8400 panel layouts.  Created RC4 package for upload.

2005-04-24: Modified sample mainline code to support warning popup if UI errors occur.

2005-04-24: Added error message if search is performed and no results are found.

2005-04-24: Vincèn PUJOL converted documentation to OpenOffice format (for ease in distributing .PDF file, more "portable" than Microsoft Word).  Completed conversion, fixed some formatting problems, updated for latest changes (mostly dealing with volume).

2005-04-24: Integrated new version of MVP-4800 touchpanel.  Added support for volume adjustments of a player, along with feedback to the panel.  Optimized internal behavior of module (optimize volume updates from server code) to smooth out volume "ramping".

2005-04-16: Released V1.0 RC3 for testing.  Modified README file for credits.

2005-04-16: Modified playlist parser to use "index" tag exclusively for new item (sync with latest nightly of SlimServer v6.0.2).  Note: This change requires SlimServer v6.0.2 or later.  Also modified playlist to show index numbers when displaying contents of a playlist.

2005-04-16: Fix bug where displaying titles from album erroneously displayed search screen.  Added one second after song completion before checking for status of player (eliminate two rapid status queries at end of each song).  In case of title duration problem (or SlimServer bug), minimum query time for status is now two seconds (not one second).

2005-04-10: Released V1.0 RC2 for testing.

2005-04-10: Due to severe performance problems with "Titles" command, modified this to strictly search for titles.  If selected, "browse level" increased to 2, but no "Titles" command is performed.  Instead, mainline is told that "Search" was selected, and search is performed.  Modified UI_Search to disallow search command if searching on titles and length is too short (helping to insure that SlimServer performs reasonably).

2005-04-10: Changed browse screen constants "Title", "Artist", "Album", "Genre", and "Playlist" to plural forms.

2005-04-05: Bug fix: Setting detailed debugging didn't refresh screen

2005-04-02: Released v1.0 RC1 for testing
Index: SlimServerMod.axi
===================================================================
RCS file: /cvsroot/netlinx-modules/NetLinx-Modules/SlimServer/SlimServerMod.axi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SlimServerMod.axi	7 Apr 2005 20:47:41 -0000	1.1
--- SlimServerMod.axi	28 Jul 2005 21:54:21 -0000	1.2
***************
*** 4,8 ****
  (*  FILE CREATED ON: 10/03/2004 AT: 09:00:00               *)
  (***********************************************************)
! (*  FILE_LAST_MODIFIED_ON: 03/28/2005  AT: 22:52:18        *)
  (***********************************************************)
  (*  ORPHAN_FILE_PLATFORM: 1                                *)
--- 4,8 ----
  (*  FILE CREATED ON: 10/03/2004 AT: 09:00:00               *)
  (***********************************************************)
! (*  FILE_LAST_MODIFIED_ON: 04/24/2005  AT: 16:46:46        *)
  (***********************************************************)
  (*  ORPHAN_FILE_PLATFORM: 1                                *)
***************
*** 82,87 ****
  char SS_Base_FeedbackV_Levels = 5;	// Base level # for player for VD feedback
  char SS_Range_FeedbackV_Channels = 10;	// # of channels used in VD feedback for any one unit
! char SS_Range_FeedbackV_Levels = 12;	// # of levels used in VD feedback for any one unit

  char SS_Base_Browse_Items = 140;	// Base varchar number for browse items
  char SS_Base_Browse_AddBtn = 160;	// Base varchar number for browse "Add" button
--- 82,88 ----
  char SS_Base_FeedbackV_Levels = 5;	// Base level # for player for VD feedback
  char SS_Range_FeedbackV_Channels = 10;	// # of channels used in VD feedback for any one unit
! char SS_Range_FeedbackV_Levels = 13;	// # of levels used in VD feedback for any one unit

+ char SS_Channel_Search = 139;		// Channel number used for "Search" button
  char SS_Base_Browse_Items = 140;	// Base varchar number for browse items
  char SS_Base_Browse_AddBtn = 160;	// Base varchar number for browse "Add" button
***************
*** 205,209 ****
  char SS_UI_errForwardTooFar	= 18;	//   Can't go forward beyond last page
  char SS_UI_errSinglePage	= 19;	//   Can't search when all data fits on screen
! char SS_UI_errStringNotFound	= 20;	//   Requested search string not found

  // Arrays to easily define definitions for browse purposes
--- 206,212 ----
  char SS_UI_errForwardTooFar	= 18;	//   Can't go forward beyond last page
  char SS_UI_errSinglePage	= 19;	//   Can't search when all data fits on screen
! char SS_UI_errSearchInvalid	= 20;	//   Can't perform search in current context
! char SS_UI_errStringTooShort	= 21;	//   Requested string too short (performance issues in 'titles')
! char SS_UI_errSearchFailed	= 22;	//   Requested search string not found

  // Arrays to easily define definitions for browse purposes
***************
*** 285,288 ****
--- 288,292 ----
      integer sleepRemaining;		//   Number of minutes remaining prior to sleep (if sleepTime is set)
      char MixerVolume;			//   Current Volume Setting: 0-100
+     char IRVolume;			//   Current Volume Setting: 0-40  (Like Squeezebox display)
      char MixerBalance;			//   Reserved: Current Balance Setting: 0-100
      char MixerBass;			//   Reserved: Current Bass Setting: 0-100
***************
*** 308,311 ****
--- 312,316 ----
  structure _sSS_UI_ErrorResult {		// Response if a UI command fails in some way
      char sessionNum;			//   Browser session number
+     dev panel;				//   Panel device that caused error
      char lvl;				//   Current depth/level of UI code
      integer errCode;			//   Error code from SlimServer UI component
***************
*** 664,667 ****
--- 669,691 ----
  }

+ define_function sinteger SS_UI_DecodeErrPacket(_sSS_UI_ErrorResult errData, char str[])
+ // SS_UI_DecodeErrPacket: Decode error packet from module
+ //   errData: Error packet (to be filled in)
+ //   str: String containing data to decode
+ //
+ // Returns: 0 if success, != 0 if failure
+ {
+     long lPos;
+     sinteger siStatus;
+ 
+     lPos = 2;
+     siStatus = string_to_variable(errData, str, lPos);
+ 
+     if (siStatus <> 0)
+ 	Diag(llSlimServer, Error, 'SlimServer', "'Failure decoding _sSS_UI_ErrorResult data, Error=',itoa(siStatus)");
+ 
+     return siStatus;
+ }
+ 

  (***********************************************************)

Index: SlimServer,VPN-CP.tpd
===================================================================
RCS file: /cvsroot/netlinx-modules/NetLinx-Modules/SlimServer/SlimServer,VPN-CP.tpd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsdGgyMT and /tmp/cvsaDeIMV differ

Index: README.txt
===================================================================
RCS file: /cvsroot/netlinx-modules/NetLinx-Modules/SlimServer/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README.txt	7 Apr 2005 20:47:40 -0000	1.1
--- README.txt	28 Jul 2005 21:54:20 -0000	1.2
***************
*** 1,6 ****
  This file is intended to be viewed with "Notepad" in word-wrap mode (see "Format" menu).

! Released Version: B1.0 (Beta Release Candidate 1)
! Release Date: Saturday, 02-Apr-2005

  -----
--- 1,6 ----
  This file is intended to be viewed with "Notepad" in word-wrap mode (see "Format" menu).

! Released Version: V1.0
! Release Date: Sunday, 15-Apr-2005

  -----
***************
*** 10,18 ****
  The SlimServer project integrates an AMX NetLinx control system and a wireless (or wired) 2-way touchpanel with a Squeezebox or Squeezebox2 from Slim Devices (http://www.slimdevices.com).

! As of the time of this release, the SlimServerMod module is compatible with the released build of SlimServer v6.0 or v6.0.1.  This module is not compatible with any previous version of the SlimServer software.

  The following files are provided:

    LICENSE.txt:			Open source license; you are obligated to abide
  				by this or not use the software
--- 10,19 ----
  The SlimServer project integrates an AMX NetLinx control system and a wireless (or wired) 2-way touchpanel with a Squeezebox or Squeezebox2 from Slim Devices (http://www.slimdevices.com).

! As of the time of this release, the SlimServerMod module is compatible with the released build of SlimServer v6.0.2 or later.  This module is not compatible with any previous version of the SlimServer software.  In particular, this module is not compatible with SlimServer v6.0 or SlimServer v6.0.1.

  The following files are provided:

+   CHANGES.txt:			Change log file
    LICENSE.txt:			Open source license; you are obligated to abide
  				by this or not use the software
***************
*** 24,28 ****

    SlimServerMod.axi:		SlimServer Include file and API definition file
!   SlimServerMod.doc:		Complete documetation file on the module
    SlimServerMod.tko:		SlimServer Module (compiled)
    SyslogMod.axi:		Syslog Include file
--- 25,29 ----

    SlimServerMod.axi:		SlimServer Include file and API definition file
!   SlimServerMod.pdf:		Complete documetation file on the module
    SlimServerMod.tko:		SlimServer Module (compiled)
    SyslogMod.axi:		Syslog Include file
***************
*** 31,35 ****
  Notes on Syslog: All files under SourceForge project NetLinx-Modules are "syslog friendly".  This means that you may choose to use syslog, or you may choose to not use syslog.  By default, syslog is disabled (and only controls logging levels to the NetLinx console via 'SEND_STRING 0' commands).

! For SlimServerMod, SlimServerMod.axi defines variable 'llSlimServer', and controls logging levels for the module.

  SlimServerMod represents an open-source project.  If you want source files, they are available via CVS from the SourceForge project 'NetLinx-Modules'.  You are free to download the source code if you wish.  If you make improvements to the code that you believe is generally useful, please submit your changes to netlinx-modules(at)taltos.com.  That way, everyone can benefit from your changes.  Thanks!
--- 32,38 ----
  Notes on Syslog: All files under SourceForge project NetLinx-Modules are "syslog friendly".  This means that you may choose to use syslog, or you may choose to not use syslog.  By default, syslog is disabled (and only controls logging levels to the NetLinx console via 'SEND_STRING 0' commands).

! For SlimServerMod, SlimServerMod.axi defines variable 'llSlimServer', and controls logging levels for the module.  Mainline is free to change these values during startup, or you may edit SlimServerMod.axi to change these values prior to startup code execution.
! 
! Notes on album cover art: If Album Art is enabled, then you must have album art stored in the SlimServer.  See SlimServer documentation for more information.  Additionally, your panel must have access to the SlimServer WWW port (defaults to port 9000).  Dynamic image name "Cover_Art" must be defined on your panel, and the dynamic image must be set for HTTP, the TCP/IP address of your SlimServer, and username/password, if necessary based on your installation.  Finally, if there is a firewall between your Modero panel and your SlimServer, the firewall must be configured to allow the Modero panel to contact the SlimServer on the appropriate port.

  SlimServerMod represents an open-source project.  If you want source files, they are available via CVS from the SourceForge project 'NetLinx-Modules'.  You are free to download the source code if you wish.  If you make improvements to the code that you believe is generally useful, please submit your changes to netlinx-modules(at)taltos.com.  That way, everyone can benefit from your changes.  Thanks!
***************
*** 39,45 ****
  The SlimServerMod code is regularly used by the author and several other sites.  It is anticipated that it'll work with virtually any version of applicable AMX code.  However, to be precise, SlimServerMod has been successfully tested with:

! 	SlimServer v6.0 and later
  	NetLinx Master (NXC) firmware 2.31.137, v3.00.316
  	Modero MVP-8400 firmware 2.46.38, 2.55.43
  	TPDesign3 version 3.16 (Build 200)
  	TPDesign4 version 2.3.1 (Build 353), version 2.4.0 (Build 406)
--- 42,58 ----
  The SlimServerMod code is regularly used by the author and several other sites.  It is anticipated that it'll work with virtually any version of applicable AMX code.  However, to be precise, SlimServerMod has been successfully tested with:

! 	SlimServer v6.0.2 and later
! 	NetLinx Master Cards: NXC-ME260, NXC-ME260/64
  	NetLinx Master (NXC) firmware 2.31.137, v3.00.316
  	Modero MVP-8400 firmware 2.46.38, 2.55.43
  	TPDesign3 version 3.16 (Build 200)
  	TPDesign4 version 2.3.1 (Build 353), version 2.4.0 (Build 406)
+ 
+ 
+ 
+ Credits:
+ 
+ . Jeff Coffler wrote SlimServerMod itself.
+ . Fred Thomas extended SlimServer CLI interface as needed for SlimServerMod.  Without his assistance, SlimServerMod would likely not have been written.
+ . Dominique Hirigoyen created the MVP-8400 touchpanel.  It looks great, doesn't it?  He also created the VPN-CP touchpanel.  Greg Gaskill created the VPN-CP touchpanel in earlier releases.
+ . Various beta testers that tested and dutifully reported problems and made suggestions.  Vincèn Pujol made some great suggestions; some features of SlimServerMod likely wouldn't exist without his feedback and input.
\ No newline at end of file

Index: SlimServer,MVP-8400.TP4
===================================================================
RCS file: /cvsroot/netlinx-modules/NetLinx-Modules/SlimServer/SlimServer,MVP-8400.TP4,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsun3Ot3 and /tmp/cvs4CtGL5 differ