Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* Added platform check at start-up to inform that this version is not…

… WindowsXP supported but Windows7 and more(see issue 1)

* Added a warning popup if ffmpeg encoding didn't stop properly
* Added version number to 1.23
  • Loading branch information...
commit 56273e0f07cd4ca297736542cb19447526f247e7 1 parent a577248
@notfrancois notfrancois authored
Showing with 18 additions and 4 deletions.
  1. +16 −2 MediaCours.py
  2. +2 −2 win-installer/installeur.iss
View
18 MediaCours.py
@@ -24,11 +24,11 @@
#*******************************************************************************
-__version__="2.2-alpha"
+__version__="2.3"
## Python import (base Python 2.4)
import sys,os,time,datetime,tarfile,ConfigParser,threading,shutil,gettext,zipfile,pickle
-import subprocess, socket, winsound, traceback, webbrowser
+import subprocess, socket, winsound, traceback, webbrowser, platform
from thread import start_new_thread, exit
from urllib2 import urlopen
from os import chdir
@@ -513,6 +513,7 @@ def ffmpegVideoRecord():
## TODO : add a check to be sure there's at least one video source ?
print "FfmpegVideoRecord video input set to:", videoinputName
print "FfmpegVideoRecord audio input set to:", audioinputName
+
if videoFormatFFMPEG=="flv":
#hide DOS console:
print "LIVE IS >>>>>>>>>>>>>>>>>>>>", live
@@ -843,6 +844,9 @@ def stopFFMPEG():
pffmpeg.kill()
except:
print "WARNING: Can't stop properly FFMPEG subprocess, attempting forced taskkill, media may not be directly readable..."
+ text=_("WARNING: Can't stop properly FFMPEG subprocess,\n attempting forced stop, media may not be readable.")
+ dialog=wx.MessageDialog(None,message=text,caption="WARNING",style=wx.OK|wx.ICON_INFORMATION)
+ dialog.ShowModal()
writeInLogs("- WARNING: Can't stop properly FFMPEG subprocess, attempting forced taskkill, media may lack header as a result and may not be directly readable... "+ str(datetime.datetime.now())+"\n")
os.popen("taskkill /F /IM ffmpeg.exe")
@@ -2689,5 +2693,15 @@ def getAudioVideoInputFfmpeg(pathData=pathData):
remotePort=8081
print 'switching remote port to '+str(remotePort)+' for standalone usage'
print "Launching integrated server with port", remotePort, "for hosts", hosts
+
+ # platform check and warning for XP
+ if ("XP" or "xp") in platform.platform():
+ dialogText= "This version is incompatible with Windows XP (works for Windows 7 and above).\n "\
+ "For Windows XP please use a previous versions of Audiovideocast (2.1 or below)."
+ print dialogText
+ dialog=wx.MessageDialog(None,message=dialogText,
+ style=wx.OK|wx.CANCEL|wx.ICON_INFORMATION)
+ dialog.ShowModal()
+
start_new_thread(goAVCremote,(remotePort,pathData,hosts))
app.MainLoop()
View
4 win-installer/installeur.iss
@@ -6,8 +6,8 @@
[Setup]
AppName=audiovideocast
AppId=audiovideocast
-AppVerName=audiovideocast 2.2
-AppVersion=2.2
+AppVerName=audiovideocast 2.3
+AppVersion=2.3
AppPublisher=(C) University of Strasbourg 2006-2014
AppPublisherURL=http://www.unistra.fr
AppSupportURL=http://www.unistra.fr
Please sign in to comment.
Something went wrong with that request. Please try again.