added some try-catch clauses to try and fix bug 928 (has not worked yet)
This commit is contained in:
fgerlits
parent
32376178d3
commit
acbc6aac27
4 changed files with 132 additions and 98 deletions
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
Author : $Author: fgerlits $
|
||||
Version : $Revision: 1.38 $
|
||||
Version : $Revision: 1.39 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.cxx,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
|
@ -758,14 +758,12 @@ GLiveSupport :: deletePlayable(Ptr<Playable>::Ref playable)
|
|||
void
|
||||
LiveSupport :: GLiveSupport ::
|
||||
GLiveSupport :: playOutputAudio(Ptr<Playable>::Ref playable)
|
||||
throw (XmlRpcException,
|
||||
std::invalid_argument,
|
||||
std::logic_error,
|
||||
std::runtime_error)
|
||||
throw (std::logic_error)
|
||||
{
|
||||
try {
|
||||
if (outputItemPlayingNow) {
|
||||
stopOutputAudio(); // stop the audio player and release old resources
|
||||
}
|
||||
stopOutputAudio(); // stop the audio player and
|
||||
} // release old resources
|
||||
|
||||
switch (playable->getType()) {
|
||||
case Playable::AudioClipType:
|
||||
|
|
@ -784,6 +782,22 @@ GLiveSupport :: playOutputAudio(Ptr<Playable>::Ref playable)
|
|||
default: // this never happens
|
||||
break;
|
||||
}
|
||||
} catch (XmlRpcException &e) {
|
||||
Ptr<Glib::ustring>::Ref eMsg
|
||||
= getResourceUstring("audioErrorMsg");
|
||||
eMsg->append(e.what());
|
||||
displayMessageWindow(eMsg);
|
||||
} catch (std::invalid_argument &e) {
|
||||
Ptr<Glib::ustring>::Ref eMsg
|
||||
= getResourceUstring("audioErrorMsg");
|
||||
eMsg->append(e.what());
|
||||
displayMessageWindow(eMsg);
|
||||
} catch (std::runtime_error &e) {
|
||||
Ptr<Glib::ustring>::Ref eMsg
|
||||
= getResourceUstring("audioErrorMsg");
|
||||
eMsg->append(e.what());
|
||||
displayMessageWindow(eMsg);
|
||||
}
|
||||
|
||||
outputPlayerIsPaused = false;
|
||||
}
|
||||
|
|
@ -814,9 +828,9 @@ GLiveSupport :: pauseOutputAudio(void)
|
|||
void
|
||||
LiveSupport :: GLiveSupport ::
|
||||
GLiveSupport :: stopOutputAudio(void)
|
||||
throw (XmlRpcException,
|
||||
std::logic_error)
|
||||
throw (std::logic_error)
|
||||
{
|
||||
try {
|
||||
outputPlayer->close();
|
||||
|
||||
if (outputItemPlayingNow) {
|
||||
|
|
@ -835,6 +849,12 @@ GLiveSupport :: stopOutputAudio(void)
|
|||
break;
|
||||
}
|
||||
}
|
||||
} catch (XmlRpcException &e) {
|
||||
Ptr<Glib::ustring>::Ref eMsg
|
||||
= getResourceUstring("audioErrorMsg");
|
||||
eMsg->append(e.what());
|
||||
displayMessageWindow(eMsg);
|
||||
}
|
||||
|
||||
outputPlayerIsPaused = false;
|
||||
}
|
||||
|
|
@ -846,14 +866,12 @@ GLiveSupport :: stopOutputAudio(void)
|
|||
void
|
||||
LiveSupport :: GLiveSupport ::
|
||||
GLiveSupport :: playCueAudio(Ptr<Playable>::Ref playable)
|
||||
throw (XmlRpcException,
|
||||
std::invalid_argument,
|
||||
std::logic_error,
|
||||
std::runtime_error)
|
||||
throw (std::logic_error)
|
||||
{
|
||||
try {
|
||||
if (cueItemPlayingNow) {
|
||||
stopCueAudio(); // stop the audio player and release old resources
|
||||
}
|
||||
stopCueAudio(); // stop the audio player and
|
||||
} // release old resources
|
||||
|
||||
switch (playable->getType()) {
|
||||
case Playable::AudioClipType:
|
||||
|
|
@ -872,6 +890,22 @@ GLiveSupport :: playCueAudio(Ptr<Playable>::Ref playable)
|
|||
default: // this never happens
|
||||
break;
|
||||
}
|
||||
} catch (XmlRpcException &e) {
|
||||
Ptr<Glib::ustring>::Ref eMsg
|
||||
= getResourceUstring("audioErrorMsg");
|
||||
eMsg->append(e.what());
|
||||
displayMessageWindow(eMsg);
|
||||
} catch (std::invalid_argument &e) {
|
||||
Ptr<Glib::ustring>::Ref eMsg
|
||||
= getResourceUstring("audioErrorMsg");
|
||||
eMsg->append(e.what());
|
||||
displayMessageWindow(eMsg);
|
||||
} catch (std::runtime_error &e) {
|
||||
Ptr<Glib::ustring>::Ref eMsg
|
||||
= getResourceUstring("audioErrorMsg");
|
||||
eMsg->append(e.what());
|
||||
displayMessageWindow(eMsg);
|
||||
}
|
||||
|
||||
cuePlayerIsPaused = false;
|
||||
}
|
||||
|
|
@ -902,9 +936,9 @@ GLiveSupport :: pauseCueAudio(void)
|
|||
void
|
||||
LiveSupport :: GLiveSupport ::
|
||||
GLiveSupport :: stopCueAudio(void)
|
||||
throw (XmlRpcException,
|
||||
std::logic_error)
|
||||
throw (std::logic_error)
|
||||
{
|
||||
try {
|
||||
cuePlayer->close();
|
||||
|
||||
if (cueItemPlayingNow) {
|
||||
|
|
@ -923,6 +957,12 @@ GLiveSupport :: stopCueAudio(void)
|
|||
break;
|
||||
}
|
||||
}
|
||||
} catch (XmlRpcException &e) {
|
||||
Ptr<Glib::ustring>::Ref eMsg
|
||||
= getResourceUstring("audioErrorMsg");
|
||||
eMsg->append(e.what());
|
||||
displayMessageWindow(eMsg);
|
||||
}
|
||||
|
||||
cuePlayerIsPaused = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
Author : $Author: fgerlits $
|
||||
Version : $Revision: 1.31 $
|
||||
Version : $Revision: 1.32 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.h,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
|
@ -101,7 +101,7 @@ class MasterPanelWindow;
|
|||
* respective documentation.
|
||||
*
|
||||
* @author $Author: fgerlits $
|
||||
* @version $Revision: 1.31 $
|
||||
* @version $Revision: 1.32 $
|
||||
* @see LocalizedObject#getBundle(const xmlpp::Element &)
|
||||
* @see AuthenticationClientFactory
|
||||
* @see StorageClientFactory
|
||||
|
|
@ -588,10 +588,7 @@ class GLiveSupport : public LocalizedConfigurable,
|
|||
*/
|
||||
virtual void
|
||||
playOutputAudio(Ptr<Playable>::Ref playable)
|
||||
throw (XmlRpcException,
|
||||
std::invalid_argument,
|
||||
std::logic_error,
|
||||
std::runtime_error);
|
||||
throw (std::logic_error);
|
||||
|
||||
/**
|
||||
* Stop the output audio player.
|
||||
|
|
@ -601,8 +598,7 @@ class GLiveSupport : public LocalizedConfigurable,
|
|||
*/
|
||||
virtual void
|
||||
stopOutputAudio(void)
|
||||
throw (XmlRpcException,
|
||||
std::logic_error);
|
||||
throw (std::logic_error);
|
||||
|
||||
/**
|
||||
* Pause the output audio player.
|
||||
|
|
@ -624,10 +620,7 @@ class GLiveSupport : public LocalizedConfigurable,
|
|||
*/
|
||||
virtual void
|
||||
playCueAudio(Ptr<Playable>::Ref playable)
|
||||
throw (XmlRpcException,
|
||||
std::invalid_argument,
|
||||
std::logic_error,
|
||||
std::runtime_error);
|
||||
throw (std::logic_error);
|
||||
|
||||
/**
|
||||
* Stop the cue audio player.
|
||||
|
|
@ -637,8 +630,7 @@ class GLiveSupport : public LocalizedConfigurable,
|
|||
*/
|
||||
virtual void
|
||||
stopCueAudio(void)
|
||||
throw (XmlRpcException,
|
||||
std::logic_error);
|
||||
throw (std::logic_error);
|
||||
|
||||
/**
|
||||
* Pause the cue audio player.
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ hu:table
|
|||
schedulerNotReachableMsg:string { "Az időzítő szerver nem elérhető" }
|
||||
storageNotReachableMsg:string { "A tároló szerver nem elérhető" }
|
||||
authenticationNotReachableMsg:string { "A beléptető szerver nem elérhető" }
|
||||
audioErrorMsg { "Hiba történt a lejátszáskor: " }
|
||||
|
||||
loginWindow:table
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ root:table
|
|||
storageNotReachableMsg:string { "Storage server not available" }
|
||||
authenticationNotReachableMsg:string
|
||||
{ "Authentication server not available" }
|
||||
audioErrorMsg { "Audio player error: " }
|
||||
|
||||
loginWindow:table
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue