History

first cut at selecting audio sources

ZappoMan committed 13 years ago

Commit c301b791 parent dc19a1c8 files · +171 −5Browse files

Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all

Unified · Split

interface/src/Application.cpp+11−1
@@ -3447,9 +3447,19 @@ void* Application::networkReceive(void* args) { · 3446 unmodified lines
34473447 case PACKET_TYPE_AVATAR_FACE_VIDEO:
34483448 processAvatarFaceVideoMessage(app->_incomingPacket, bytesReceived);
34493449 break;
3450− default:
3450+ default: {
34513451 NodeList::getInstance()->processNodeData(&senderAddress, app->_incomingPacket, bytesReceived);
3452+
3453+ // Check to see if we have our ownerID
3454+ uint16_t ownerID = NodeList::getInstance()->getOwnerID();
3455+
3456+ if (ownerID != app->_audio.getSourceID()) {
3457+ app->_audio.setSourceID(ownerID);
3458+ }
3459+
3460+
34523461 break;
3462+ }
34533463 }
34543464 }
34553465 } else if (!app->_enableNetworkThread) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t