i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary code.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23719 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2008-01-24 13:45:59 +00:00
parent 020cbad9d4
commit 511c231b35
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/ServerWindow.cpp
+5 -8
View File
@@ -94,7 +94,6 @@ struct direct_window_data {
sem_id sem_ack; sem_id sem_ack;
area_id area; area_id area;
bool started; bool started;
int next_buffer_state;
direct_buffer_info *buffer_info; direct_buffer_info *buffer_info;
}; };
@@ -105,7 +104,6 @@ direct_window_data::direct_window_data()
sem_ack(-1), sem_ack(-1),
area(-1), area(-1),
started(false), started(false),
next_buffer_state(0),
buffer_info(NULL) buffer_info(NULL)
{ {
area = create_area("direct area", (void **)&buffer_info, area = create_area("direct area", (void **)&buffer_info,
@@ -3045,19 +3043,18 @@ ServerWindow::HandleDirectConnection(int32 bufferState, int32 driverState)
&& (bufferState & B_DIRECT_MODE_MASK) != B_DIRECT_START)) && (bufferState & B_DIRECT_MODE_MASK) != B_DIRECT_START))
return; return;
// If the direct connection is stopped, only continue if a start notification is received. // Don't issue a DirectConnected() notification
// But save the "reason" of the call (B_BUFFER_RESIZED, B_CLIPPING_MODIFIED, etc) // if the connection is stopped, and we are called
// with bufferState == B_DIRECT_MODIFY.
if ((fDirectWindowData->buffer_info->buffer_state & B_DIRECT_MODE_MASK) == B_DIRECT_STOP if ((fDirectWindowData->buffer_info->buffer_state & B_DIRECT_MODE_MASK) == B_DIRECT_STOP
&& (bufferState & B_DIRECT_MODE_MASK) != B_DIRECT_START) { && (bufferState & B_DIRECT_MODE_MASK) != B_DIRECT_START) {
fDirectWindowData->next_buffer_state |= bufferState & ~B_DIRECT_MODE_MASK;
return; return;
} }
fDirectWindowData->started = true; fDirectWindowData->started = true;
fDirectWindowData->buffer_info->buffer_state = if (bufferState != -1)
(direct_buffer_state)(bufferState | fDirectWindowData->next_buffer_state); fDirectWindowData->buffer_info->buffer_state = (direct_buffer_state)bufferState;
fDirectWindowData->next_buffer_state = 0;
if (driverState != -1) if (driverState != -1)
fDirectWindowData->buffer_info->driver_state = (direct_driver_state)driverState; fDirectWindowData->buffer_info->driver_state = (direct_driver_state)driverState;