vbox的更動 61986 路徑 trunk/src/VBox/Main
- 時間撮記:
- 2016-7-1 下午04:03:33 (8 年 以前)
- 檔案:
-
- 修改 1 筆資料
圖例:
- 未更動
- 新增
- 刪除
-
trunk/src/VBox/Main/src-server/AudioAdapterImpl.cpp
r61380 r61986 60 60 * @param aParent Handle of the parent object. 61 61 */ 62 HRESULT AudioAdapter::init 62 HRESULT AudioAdapter::init(Machine *aParent) 63 63 { 64 64 LogFlowThisFunc(("aParent=%p\n", aParent)); … … 103 103 * @note Locks @a aThat object for reading. 104 104 */ 105 HRESULT AudioAdapter::init 105 HRESULT AudioAdapter::init(Machine *aParent, AudioAdapter *aThat) 106 106 { 107 107 LogFlowThisFunc(("aParent=%p, aThat=%p\n", aParent, aThat)); … … 116 116 unconst(mPeer) = aThat; 117 117 118 AutoCaller thatCaller 118 AutoCaller thatCaller(aThat); 119 119 AssertComRCReturnRC(thatCaller.rc()); 120 120 … … 135 135 * @note Locks @a aThat object for reading. 136 136 */ 137 HRESULT AudioAdapter::initCopy 137 HRESULT AudioAdapter::initCopy(Machine *aParent, AudioAdapter *aThat) 138 138 { 139 139 LogFlowThisFunc(("aParent=%p, aThat=%p\n", aParent, aThat)); … … 148 148 /* mPeer is left null */ 149 149 150 AutoCaller thatCaller 150 AutoCaller thatCaller(aThat); 151 151 AssertComRCReturnRC(thatCaller.rc()); 152 152 … … 316 316 317 317 default: 318 AssertMsgFailed 319 318 AssertMsgFailed(("Wrong audio controller type %d\n", 319 aAudioController)); 320 320 rc = E_FAIL; 321 321 } … … 381 381 382 382 default: 383 AssertMsgFailed 384 383 AssertMsgFailed(("Wrong audio controller type %d\n", 384 mData->controllerType)); 385 385 rc = E_FAIL; 386 386 } … … 388 388 if (!SUCCEEDED(rc)) 389 389 return setError(rc, 390 tr 390 tr("Invalid audio codec type %d"), 391 391 aAudioCodec); 392 392 … … 535 535 /* sanity */ 536 536 AutoCaller autoCaller(this); 537 AssertComRCReturnVoid 537 AssertComRCReturnVoid(autoCaller.rc()); 538 538 539 539 /* sanity too */ 540 AutoCaller peerCaller 541 AssertComRCReturnVoid 540 AutoCaller peerCaller(mPeer); 541 AssertComRCReturnVoid(peerCaller.rc()); 542 542 543 543 /* lock both for writing since we modify both (mPeer is "master" so locked … … 562 562 void AudioAdapter::i_copyFrom(AudioAdapter *aThat) 563 563 { 564 AssertReturnVoid 564 AssertReturnVoid(aThat != NULL); 565 565 566 566 /* sanity */ 567 567 AutoCaller autoCaller(this); 568 AssertComRCReturnVoid 568 AssertComRCReturnVoid(autoCaller.rc()); 569 569 570 570 /* sanity too */ 571 AutoCaller thatCaller 572 AssertComRCReturnVoid 571 AutoCaller thatCaller(aThat); 572 AssertComRCReturnVoid(thatCaller.rc()); 573 573 574 574 /* peer is not modified, lock it for reading (aThat is "master" so locked
注意:
瀏覽 TracChangeset
來幫助您使用更動檢視器