CVS:

CVS:
CVS:
CVS:

1 files changed, 33 insertions, 94 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
index 6bbe7d97138..b01ebce5a9b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
@@ -7,17 +7,13 @@ Video_Control_i::Video_Control_i ()
 {
 }
 
-CORBA::Boolean 
-Video_Control_i::init_video (const Video_Control::INITvideoPara &para,
-                             Video_Control::INITvideoReply_out reply,
-                             CORBA::Environment& env)
+Video_Control_Handler *
+Video_Control_i::get_video_control_handler ()
 {
-  
+
   Video_Control_Handler_Instance *vchi;
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t)Video_Control_i::init_video () called \n"));
   Video_Control_Handler *vch ;
-  
+   
   if ((vchi = VIDEO_CONTROL_HANDLER_INSTANCE::instance () )!= 0)
     {
       vch = VIDEO_CONTROL_HANDLER_INSTANCE::instance ()->get_video_control_handler () ;
@@ -25,20 +21,33 @@ Video_Control_i::init_video (const Video_Control::INITvideoPara &para,
                   "Video_Control_Handler_instance address %x,%x\n",
                   vchi,
                   vch));
-
+      
+      
     }
   else
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%P|%t)Video_control_Handler_instance is null \n"),
-                      -1);
-
+                      0);
+  
   if (vch == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
                        "(%P|%t)Video_Control_Handler_Instance::get_video_Control_handler returned null \n"),
-                      -1);
+                      0);
+  
+  return vch;
+}
 
+CORBA::Boolean 
+Video_Control_i::init_video (const Video_Control::INITvideoPara &para,
+                             Video_Control::INITvideoReply_out reply,
+                             CORBA::Environment& env)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P|%t) Video_Control_i::init_video () called\n"));
   
-  CORBA::Boolean result = vch->init_video (para,reply,env);
+  CORBA::Boolean result = this->get_video_control_handler ()->init_video (para,
+                                                  reply,
+                                                  env);
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Video_Control_State::init_video returned %d\n", result));
   return result;
 
@@ -72,7 +81,10 @@ CORBA::Boolean
 Video_Control_i::fast_forward (const Video_Control::FFpara &para,
                                CORBA::Environment& env)
 {
-  return 0;
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P|%t) Video_Control_i::fast_forward () called\n"));
+  return this->get_video_control_handler ()->fast_forward (para,
+                                                           env);
 }
 
 
@@ -99,32 +111,9 @@ Video_Control_i::play (const Video_Control::PLAYpara &para,
                        CORBA::Long_out vts,
                        CORBA::Environment& env)
 {
-  Video_Control_Handler_Instance *vchi;
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t)Video_Control_i::play () called \n"));
-  Video_Control_Handler *vch ;
-  
-  if ((vchi = VIDEO_CONTROL_HANDLER_INSTANCE::instance ())!= 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Video_Control_Handler_instance address %x\n",
-                  vchi));
-    vch = VIDEO_CONTROL_HANDLER_INSTANCE::instance ()->get_video_control_handler () ;
-    }
-  else
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Video_control_Handler_instance is null \n"),
-                      -1);
-
-  if (vch == 0)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       "(%P|%t) Video_Control_Handler_Instance::get_video_Control_handler returned null \n"),
-                      -1);
-  
-  else
-    //    vch->play (para,vts,env);
-    vch->play (para,vts,env);
-  return 0;
+  return this->get_video_control_handler ()->play (para,
+                                                   vts,
+                                                   env);
 }
 
 
@@ -140,33 +129,8 @@ CORBA::Boolean
 Video_Control_i::speed (const Video_Control::SPEEDpara &para,
                         CORBA::Environment& env)
 {
-  Video_Control_Handler_Instance *vchi;
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t)Video_Control_i::stop () \n"));
-  Video_Control_Handler *vch ;
-  
-  if ((vchi = VIDEO_CONTROL_HANDLER_INSTANCE::instance () )!= 0)
-    {
-      vch = VIDEO_CONTROL_HANDLER_INSTANCE::instance ()->get_video_control_handler () ;
-      ACE_DEBUG ((LM_DEBUG,
-                  "Video_Control_Handler_instance address %x,%x",
-                  vchi,vch));
-
-    }
-  else
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t)Video_control_Handler_instance is null \n"),
-                      -1);
-
-  if (vch == 0)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       "(%P|%t)Video_Control_Handler_Instance::get_video_Control_handler returned null \n"),
-                      -1);
-  
-  else
-    return vch->speed (para,env);
-
-  return 0;
+  return this->get_video_control_handler ()->speed (para,
+                            env);
 }
 
 
@@ -174,33 +138,8 @@ CORBA::Boolean
 Video_Control_i::stop (CORBA::Long cmdsn,
                        CORBA::Environment& env)
 {
-  Video_Control_Handler_Instance *vchi;
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t)Video_Control_i::stop () \n"));
-  Video_Control_Handler *vch ;
-  
-  if ((vchi = VIDEO_CONTROL_HANDLER_INSTANCE::instance () )!= 0)
-    {
-      vch = VIDEO_CONTROL_HANDLER_INSTANCE::instance ()->get_video_control_handler () ;
-      ACE_DEBUG ((LM_DEBUG,
-                  "Video_Control_Handler_instance address %x,%x",
-                  vchi,vch));
-
-    }
-  else
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t)Video_control_Handler_instance is null \n"),
-                      -1);
-
-  if (vch == 0)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       "(%P|%t)Video_Control_Handler_Instance::get_video_Control_handler returned null \n"),
-                      -1);
-  
-  else
-    return vch->stop (cmdsn,env);
-
-  return 0;
+  return this->get_video_control_handler ()->stop (cmdsn,
+                           env);
 }
 
 Video_Control_i::~Video_Control_i ()