[Wxlua-commit] wxLua/samples media.wx.lua,1.4,1.5

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/samples
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20170/samples

Modified Files:
	media.wx.lua 
Log Message:
Make the sample a little nicer by allowing cursor keys on position scrollbar.
Fix unsigned int input to function


Index: media.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/media.wx.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** media.wx.lua	22 Jan 2008 04:45:39 -0000	1.4
--- media.wx.lua	25 May 2009 18:26:26 -0000	1.5
***************
*** 53,72 ****
      local stop_ok  = false
  
!     local state = mediaCtrl:GetState()
! 
!     if not loadedMedia then state = -1 end -- not valid to do anything
  
!     if state == wx.wxMEDIASTATE_PLAYING then
!         play_ok  = false
!         pause_ok = true
!         stop_ok  = true
!     elseif state == wx.wxMEDIASTATE_PAUSED then
!         play_ok  = true
!         pause_ok = false
!         stop_ok  = true
!     else --if state == wx.wxMEDIASTATE_STOPPED then
!         play_ok  = true
!         pause_ok = false
!         stop_ok  = false
      end
  
--- 53,73 ----
      local stop_ok  = false
  
!     if loadedMedia then 
!         -- Note: state may be -1 after first loading a file
!         local state = mediaCtrl:GetState()
  
!         if state == wx.wxMEDIASTATE_PLAYING then
!             play_ok  = false
!             pause_ok = true
!             stop_ok  = true
!         elseif state == wx.wxMEDIASTATE_PAUSED then
!             play_ok  = true
!             pause_ok = false
!             stop_ok  = true
!         else -- if state == wx.wxMEDIASTATE_STOPPED then
!             play_ok  = true
!             pause_ok = false
!             stop_ok  = false
!         end
      end
  
***************
*** 206,224 ****
              function (event) settingPos = true end)
  
!     panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_THUMBRELEASE,
!             function (event)
!                 if loadedMedia then
!                     local pos = event:GetPosition()
!                     local len = mediaCtrl:Length()
!                     local ok = mediaCtrl:Seek(len*pos/slider_range)
!                     if ok == wx.wxInvalidOffset then
!                         wx.wxMessageBox(string.format("Unable to seek in %s: Unsupported format?", fileName),
!                                         "wxLua Media Demo",
!                                         wx.wxICON_ERROR + wx.wxOK)
!                     end
!                 end
  
!                 settingPos = false
!             end )
  
      mediaCtrl:Connect(wx.wxEVT_MEDIA_STATECHANGED,
--- 207,232 ----
              function (event) settingPos = true end)
  
!     local function scroll_position(event)
!         if loadedMedia then
!             local pos = event:GetPosition()
!             local len = mediaCtrl:Length()
!             print(pos, len)
!             local ok = mediaCtrl:Seek(math.floor(len*pos/slider_range))
!             if ok == wx.wxInvalidOffset then
!                 wx.wxMessageBox(string.format("Unable to seek in %s: Unsupported format?", fileName),
!                                 "wxLua Media Demo",
!                                 wx.wxICON_ERROR + wx.wxOK)
!             end
!         end
!             settingPos = false
!     end
  
!     panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_THUMBRELEASE, scroll_position)
!     panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_TOP, scroll_position)
!     panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_BOTTOM, scroll_position)
!     panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_LINEUP, scroll_position)
!     panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_LINEDOWN, scroll_position)
!     panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_PAGEUP, scroll_position)
!     panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_PAGEDOWN, scroll_position)
  
      mediaCtrl:Connect(wx.wxEVT_MEDIA_STATECHANGED,