[ingex-commits] ingex/studio/ace-tao/Ingexgui/src player.cpp, 1.32, 1.33

[John F. <jo...@us...>]

Update of /cvsroot/ingex/ingex/studio/ace-tao/Ingexgui/src
In directory vz-cvs-4.sog:/tmp/cvs-serv25679

Modified Files:
	player.cpp 
Log Message:
Wasn't initially setting OSD position in E-E mode.


Index: player.cpp
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/ace-tao/Ingexgui/src/player.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** player.cpp	19 Apr 2011 07:04:02 -0000	1.32
--- player.cpp	28 Apr 2011 16:35:41 -0000	1.33
***************
*** 671,674 ****
--- 671,676 ----
                  input.name = mFileNames[i];
                  input.type = mInputType;
+ // line below must remain commented out until player is updated for option to work correctly in all formats
+ //                input.options["fallback_blank"] = (i < mNVideoTracks) ? "true" : "false"; //display a blank source if the file cannot be opened, to avoid pictures rearranging themselves as files appear
                  inputs.push_back(input);
              }
***************
*** 717,721 ****
                      }
                      SetOSDType();
-                     SetOSDPosition();
  #ifndef DISABLE_SHARED_MEM_SOURCE
                  }
--- 719,722 ----
***************
*** 729,732 ****
--- 730,734 ----
                  }
  #endif
+                 SetOSDPosition();
                  mChunkLinking = STATE_CHANGE; //next recording loaded is not linked to this one
                  // work out which track to select