- Timestamp:
- Sep 30, 2014 3:32:03 PM (11 years ago)
- svn:sync-xref-src-repo-rev:
- 96332
- Location:
- trunk/src/VBox/Main
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/DisplayImpl.h
r52769 r52901 108 108 uint32_t cbVbvaPartial; 109 109 110 /* Old guest additions (3.x and older) use both VMMDev and DevVGA refresh timer 110 /* Old guest additions (3.x and older) use both VMMDev and DevVGA refresh timer 111 111 * to process the VBVABUFFER memory. Therefore the legacy VBVA (VideoAccel) host 112 112 * code can be executed concurrently by VGA refresh timer and the guest VMMDev … … 198 198 virtual void i_getFramebufferDimensions(int32_t *px1, int32_t *py1, 199 199 int32_t *px2, int32_t *py2); 200 200 201 201 static const PDMDRVREG DrvReg; 202 202 … … 257 257 virtual HRESULT handleEvent(const ComPtr<IEvent> &aEvent); 258 258 259 // other internal methods 259 // other internal methods 260 260 HRESULT takeScreenShotWorker(ULONG aScreenId, 261 261 BYTE *aAddress, -
trunk/src/VBox/Main/include/QMTranslator.h
r52559 r52901 21 21 class QMTranslator_Impl; 22 22 23 class QMTranslator 23 class QMTranslator 24 24 { 25 25 public: … … 27 27 virtual ~QMTranslator(); 28 28 29 /* Gets translation from loaded QM file 30 * 29 /* Gets translation from loaded QM file 30 * 31 31 * @param context QM context to look for translation 32 32 * @param source Source string in one-byte encoding -
trunk/src/VBox/Main/src-all/QMTranslatorImpl.cpp
r52559 r52901 55 55 return RT_BE2H_U16(value); 56 56 } 57 57 58 58 public: 59 59 … … 411 411 }; 412 412 413 try 413 try 414 414 { 415 415 FileLoader loader(pszFilename); -
trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
r52319 r52901 1872 1872 } 1873 1873 1874 1875 1874 aNames.resize(cEntries); 1876 1875 aValues.resize(cEntries); -
trunk/src/VBox/Main/src-client/EbmlWriter.cpp
r52888 r52901 277 277 /* Creates EBML output file. */ 278 278 inline int create(const char *a_pszFilename) 279 { 279 { 280 280 return RTFileOpen(&m_File, a_pszFilename, RTFILE_O_CREATE | RTFILE_O_WRITE | RTFILE_O_DENY_NONE); 281 281 } 282 282 283 283 /* Returns file size. */ 284 inline uint64_t getFileSize() 284 inline uint64_t getFileSize() 285 285 { 286 286 return RTFileTell(m_File); … … 349 349 } 350 350 351 /* Serializes an UNSIGNED integer 351 /* Serializes an UNSIGNED integer 352 352 * If size is zero then it will be detected automatically. */ 353 353 inline Ebml &serializeUnsignedInteger(EbmlClassId classId, uint64_t parm, size_t size = 0) … … 601 601 .serializeUnsignedInteger(CueClusterPosition, it->loc - m_uPositionReference, 8) 602 602 .subEnd(CueTrackPositions) 603 .subEnd(CuePoint); 603 .subEnd(CuePoint); 604 604 } 605 605 -
trunk/src/VBox/Main/src-client/EbmlWriter.h
r52791 r52901 40 40 WebMWriter(); 41 41 virtual ~WebMWriter(); 42 42 43 43 /* Creates output file 44 * 44 * 45 45 * @param a_pszFilename Name of the file to create. 46 46 * … … 53 53 /* Writes WebM header to file. 54 54 * Should be called before any writeBlock call. 55 * 55 * 56 56 * @param a_pCfg Pointer to VPX Codec configuration structure. 57 57 * @param a_pFps Framerate information (frames per second). … … 62 62 63 63 /* Writes a block of compressed data 64 * 64 * 65 65 * @param a_pCfg Pointer to VPX Codec configuration structure. 66 66 * @param a_pPkt VPX data packet. -
trunk/src/VBox/Main/src-client/VideoRec.cpp
r52791 r52901 531 531 pStrm->uEncoderDeadline = VPX_DL_BEST_QUALITY; 532 532 } 533 else 533 else 534 534 { 535 535 LogRel(("Settings quality deadline to = %s\n", value.c_str())); … … 555 555 pStrm->uDelay = 1000 / uFps; 556 556 557 struct vpx_rational arg_framerate = { uFps, 1 };557 struct vpx_rational arg_framerate = { (int)uFps, 1 }; 558 558 rc = pStrm->Ebml.writeHeader(&pStrm->VpxConfig, &arg_framerate); 559 559 AssertRCReturn(rc, rc); -
trunk/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp
r52897 r52901 66 66 wchar_t *pwczTmpStr; 67 67 68 st.rcps_flags = RCPSF_NO_STR2IPCONV; 68 st.rcps_flags = RCPSF_NO_STR2IPCONV; 69 69 int rc = rcp_parse(&st, m->resolvConfFilename.c_str()); 70 70 if (rc == -1) -
trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp
r52897 r52901 62 62 63 63 CFRelease(m->m_RunLoopRef); 64 64 65 65 CFRelease(m->m_DnsWatcher); 66 66 … … 123 123 CFRunLoopSourceSignal(m->m_Stopper); 124 124 CFRunLoopWakeUp(m->m_RunLoopRef); 125 125 126 126 RTSemEventWait(m->m_evtStop, RT_INDEFINITE_WAIT); 127 127 }
Note:
See TracChangeset
for help on using the changeset viewer.