Changeset 1297

Timestamp:

11/01/07 13:55:14 (10 months ago)

Author:

calvin

Message:

optimized machine view, wave export works with >16 bits, fix crashes when stream plugin wasnt found

Location:

trunk/src/buzelib

Files:

• Document.cpp (modified) (1 diff)
• FileBrowserView.cpp (modified) (2 diffs)
• MachineView.cpp (modified) (14 diffs)
• MachineView.h (modified) (5 diffs)
• MainFrm.cpp (modified) (1 diff)
• WaveTableView.cpp (modified) (2 diffs)

trunk/src/buzelib/Document.cpp

@@ -56 +56 @@
                 streamplayer->initialize(0, 0, 0, 0, 0);
                 player->master->addAudioInput(streamplayer, 0x4000, 0x4000);
+                streamplayer->nonSongPlugin = true;
         } else {
                 streamplayer = 0;
-        }
-
-        if (!streamplayer)
-                printf("Cant can't create streamplayer plugin instance.\n"); else
-                streamplayer->nonSongPlugin = true;
+                printf("Cant can't create streamplayer plugin instance.\n");
+        }
 }
 

trunk/src/buzelib/FileBrowserView.cpp

@@ -204 +204 @@
         if (selectedFiles.size() == 0) return 0;
 
+        if (!mainFrame->document->streamplayer) return 0;
+
         CFileInfo* fileInfo = selectedFiles[0];
         if (mainFrame->document->isNotePlaying(mainFrame->document->streamplayer, note)) return 0;
@@ -233 +235 @@
         if (note == -1) return 0;
 
+        if (!mainFrame->document->streamplayer) return 0;
         mainFrame->document->playMachineNote(mainFrame->document->streamplayer, zzub::note_value_off, note);
         return 0;

trunk/src/buzelib/MachineView.cpp

@@ -16 +16 @@
 #include <iomanip>
 #include <strstream>
+#include <limits>
 #include "Utils/Keymaps.h"
 
@@ -39 +40 @@
         isConnecting = false;
         isPanSlider = false;
-        redrawMode = MachineViewAll;
         mbuttonState = false;
         isLButtonDown = false;
@@ -45 +45 @@
         moveType = MachineViewMoveNothing;
         SetRect(&prevDragRect, -1, -1, -1, -1);
+
+        dirtyOffscreenBitmap = true;
+        dirtyMachines = dirtySelectionRectangle = dirtyStatus = dirtyVolumeSlider = false;
 }
 
@@ -455 +458 @@
 }
 
+void minMaxRect(RECT* rcOut, RECT* rcIn) {
+        if (rcIn->left < rcOut->left)
+                rcOut->left = rcIn->left;
+        if (rcIn->top < rcOut->top)
+                rcOut->top = rcIn->top;
+        if (rcIn->right > rcOut->right)
+                rcOut->right = rcIn->right;
+        if (rcIn->bottom > rcOut->bottom)
+                rcOut->bottom = rcIn->bottom;
+}
+
 LRESULT CMachineView::OnMouseMove(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
 
-        //if (draggingMachine && isConnecting) {
         if (moveType==MachineViewMoveConnectMachines) {
                 if (((wParam&MK_SHIFT) != 0) || mbuttonState ) {
@@ -472 +485 @@
         } else
         if (moveType==MachineViewMovePanSlider) {
-//      if (draggingMachine && isPanSlider) {
                 // adjust panning = calculate pan value
                 POINT pt={(signed short)LOWORD(lParam),(signed short)HIWORD(lParam)};
@@ -495 +507 @@
         } else
         if (moveType==MachineViewMoveSelectedMachines) {
-//      if (draggingMachine) {
                 POINT ppt={offX, offY};
                 POINT pt={(signed short)LOWORD(lParam),(signed short)HIWORD(lParam)};
@@ -507 +518 @@
                 if (fabs(mdx)==0 && fabs(mdy)==0) return 0;
 
-                // todo: her skal vi egentlig sette posisjon på alle valgte maskiner
-                // så, vi finner deltaet som denne maskinen flytter seg
+                RECT rcInvalidate = { 
+                        0x10000000, 0x10000000, 
+                        -0x10000000, -0x10000000, 
+                };
+
+                // move the selected machines, and find the smallest area on screen 
+                // that needs to be repainted
                 for (int i=0; i<document->getSelectedMachines(); i++) {
-                        document->getSelectedMachine(i)->x+=mdx;
-                        document->getSelectedMachine(i)->y+=mdy;
-                }
-                invalidateMachines();
-                offX=pt.x;
-                offY=pt.y;
+                        RECT selrc;
+                        zzub::metaplugin* selplugin = document->getSelectedMachine(i);
+                        getMachineRect(selplugin, &selrc);
+                        InflateRect(&selrc, 3, 3);
+                        minMaxRect(&rcInvalidate, &selrc);
+
+                        selplugin->x += mdx;
+                        selplugin->y += mdy;
+
+                        getMachineRect(selplugin, &selrc);
+                        InflateRect(&selrc, 3, 3);
+                        minMaxRect(&rcInvalidate, &selrc);
+
+                        // make sure the invalidation rect covers all machines we are connected to
+                        for (int j = 0; j < selplugin->inConnections.size(); j++) {
+                                metaplugin* selconnplugin = selplugin->inConnections[j]->plugin_in;
+                                if (selconnplugin->nonSongPlugin) continue;
+
+                                getMachineRect(selconnplugin, &selrc);
+                                InflateRect(&selrc, 3, 3);
+                                minMaxRect(&rcInvalidate, &selrc);
+                        }
+
+                        for (int j = 0; j < selplugin->outConnections.size(); j++) {
+                                metaplugin* selconnplugin = selplugin->outConnections[j]->plugin_out;
+                                if (selconnplugin->nonSongPlugin) continue;
+
+                                getMachineRect(selconnplugin, &selrc);
+                                InflateRect(&selrc, 3, 3);
+                                minMaxRect(&rcInvalidate, &selrc);
+                        }
+                }
+                dirtyMachines = true;
+                InvalidateRect(&rcInvalidate, FALSE);
+                offX = pt.x;
+                offY = pt.y;
         } else
         if (moveType==MachineViewMoveVolumeSlider) {
-        //if (isVolumeSlider) {
-                // change connection amp
                 POINT pt={(signed short)LOWORD(lParam),(signed short)HIWORD(lParam)};
         int dist=offY-pt.y;
@@ -539 +583 @@
         } else
         if (moveType==MachineViewMoveAllMachines) {
-//      if (isLButtonDown && isCtrlDown()) {
                 POINT ppt={offX, offY};
                 POINT pt={(signed short)LOWORD(lParam),(signed short)HIWORD(lParam)};
@@ -672 +715 @@
 
 LRESULT CMachineView::OnPaint(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+
         CPaintDC screenDC(m_hWnd);
-        
-        if (redrawMode==MachineViewSelectionRectangle) {
-                // if we only update the selection rectangle, draw directly to mr screen
-                paintSelectionRect(screenDC);
-        } else {
-                CMemDC dc(screenDC);
-
-                if (redrawMode&MachineViewBoxes)
-                        paintMachines(dc);
-
-                if (redrawMode&MachineViewStatus)
-                        paintMachineStatus(dc);
-
-                if (redrawMode&MachineViewVolume)
-                        paintVolume(dc);
-
-                if (redrawMode&MachineViewSelectionRectangle)
-                        paintSelectionRect(dc);
-        }
-
-
+
+        CDC offscreenDC;
+        offscreenDC.CreateCompatibleDC(screenDC);
+
+        RECT rcClip;
+        screenDC.GetClipBox(&rcClip);
+
+        if (dirtyOffscreenBitmap) {
+                if (offscreenBitmap.m_hBitmap)
+                        offscreenBitmap.DeleteObject();
+
+                RECT rcClient;
+                GetClientRect(&rcClient);
+                offscreenBitmap.CreateCompatibleBitmap(screenDC, rcClient.right, rcClient.bottom);
+
+                dirtyMachines = true;
+                dirtyOffscreenBitmap = false;
+
+        }
+
+        CBitmapHandle oldbitmap = offscreenDC.SelectBitmap(offscreenBitmap);
+
+        if (dirtyMachines) {
+                offscreenDC.FillSolidRect(rcClip.left, rcClip.top, rcClip.right - rcClip.left, rcClip.bottom - rcClip.top, backgroundColor);
+                paintMachines(offscreenDC);
+                dirtyStatus = true;
+        }
+
+        if (dirtyStatus)
+                paintMachineStatus(offscreenDC);
+
+        if (dirtyVolumeSlider)
+                paintVolume(offscreenDC);
+
+        if (dirtySelectionRectangle)
+                paintSelectionRect(offscreenDC);
+
+
+        dirtyMachines = dirtySelectionRectangle = dirtyStatus = dirtyVolumeSlider = false;
+
+    screenDC.BitBlt(
+                rcClip.left, rcClip.top, rcClip.right - rcClip.left, rcClip.bottom - rcClip.top,
+                offscreenDC, rcClip.left, rcClip.top, SRCCOPY);
+
+        offscreenDC.SelectBitmap(oldbitmap);
+
+        return 0;
+}
+
+LRESULT CMachineView::OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+        dirtyOffscreenBitmap = true;
+        Invalidate(FALSE);
         return 0;
 }
@@ -725 +800 @@
         prevDragRect = rc;
 }
-
-
-
 
 void CMachineView::showMachineContext(POINT pt, metaplugin* machine) {
@@ -1024 +1096 @@
 
 void CMachineView::invalidateMachines() {
-        redrawMode=MachineViewAll;
+        dirtyMachines = true;
         Invalidate(FALSE);
-        UpdateWindow();
-        redrawMode=MachineViewAll;
 }
 
 void CMachineView::invalidateConnectionVolume() {
-        redrawMode=MachineViewVolume;
-
-        connection* conn=document->getSelectedConnection();
+        dirtyVolumeSlider = true;
+
+        connection* conn = document->getSelectedConnection();
 
         RECT vsr;
         getVolumeSliderRect(conn, &vsr);
         InvalidateRect(&vsr, FALSE);
-
-        UpdateWindow();
-        redrawMode=MachineViewAll;
-
 }
 
 void CMachineView::invalidateSelectionRectangle() {
-        redrawMode=MachineViewSelectionRectangle;
-
+        dirtySelectionRectangle = true;
         Invalidate(FALSE);
-
-        UpdateWindow();
-        redrawMode=MachineViewAll;
-
 }
 
 void CMachineView::invalidateStatus() {
-        redrawMode=MachineViewStatus;
-
-        for (size_t i=0; i<player->getMachines(); i++) {
-                metaplugin* machine=player->getMachine(i);
+        dirtyStatus = true;
+
+        for (size_t i = 0; i < player->getMachines(); i++) {
+                metaplugin* machine = player->getMachine(i);
                 if (!machine) continue;
                 if (machine->nonSongPlugin) continue;
@@ -1065 +1126 @@
                 InvalidateRect(&rc, FALSE);
         }
-
-        UpdateWindow();
-        redrawMode=MachineViewAll;
-
 }
 
 void CMachineView::invalidateMachine(metaplugin* machine) {
+        dirtyMachines = true;
+
         RECT rc;
         getMachineRect(machine, &rc);
-        redrawMode=MachineViewBoxes;
         InvalidateRect(&rc, FALSE);
 }
@@ -1243 +1301 @@
         getMachineRect(plugin, &mRect);
         
-        int fontIndex=(scale/MAX_MACHINE_SCALE)*((float)MAX_MACHINE_FONTS-0.5);
-        CFont prevFont=dc.SelectFont(machineFont[fontIndex]);
-
-        UINT prevAlign=dc.SetTextAlign(TA_CENTER);
-        int prevBkMode=dc.SetBkMode(TRANSPARENT);
-
         // draw outer box
         CPenHandle oldPen = dc.SelectPen(borderPen);
         CBrushHandle oldBrush = dc.SelectBrush(getMachineBrush(plugin));
-        dc.Rectangle(mRect.left, mRect.top, mRect.right, mRect.bottom);
         
         MachineSkin* skin = mainFrame->getSkin(plugin->loader->plugin_info->uri);
@@ -1262 +1313 @@
                 ::GetObject(skin->skin, sizeof(BITMAP), &bm);
                 dc.StretchBlt(mRect.left, mRect.top, halfWidth*2, halfHeight*2, bitmapDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY);
-        }
-
-        connection* masterConnection=player->getMaster()->getConnection(plugin);
-        // hvis denne går til master, så tegner vi connection-panning-fixing:
-        if (masterConnection) {
-                // draw panning box inside normal box
-                dc.SelectBrush(getMachinePanningBrush(plugin));
-                dc.Rectangle(mRect.left+2, mRect.bottom-(10.0*scale), mRect.right-2, mRect.bottom-2);
-    
-                // and the little pan-slider:
-
-                RECT pRect;
-                dc.SelectBrush(panHandleBrush);
-                getPanSliderRect(masterConnection, &pRect);
-                dc.Rectangle(&pRect);
-        }
-
-        string label=plugin->getName();
-        if (player->getSoloMachine()!=0 && player->getSoloMachine()!=plugin)
-                label="["+label+"]";
-
-        if (plugin->isMuted())
-                label="("+label+")";
-
-        float fontSize=(scale+1)*8;
-
-        int adjustY=plugin->minimized?-fontSize:0;
-
-        if (skin && skin->skin && !plugin->minimized)
-                dc.SetTextColor(skin->textColor); else
-                dc.SetTextColor(0);
-        dc.TextOut(mRect.left+halfWidth, mRect.top+halfHeight-(fontSize/2)+adjustY, label.c_str(), label.length());
-
-        if (!ledOnly && document->isSelectedMachine(plugin)) {
-                RECT fRect = mRect;
-                fRect.left -= 2;
-                fRect.top -= 2;
-                fRect.right += 2;
-                fRect.bottom += 2;
-                dc.SetTextColor(0);
-                dc.DrawFocusRect(&fRect);
-                InflateRect(&fRect, 1, 1);
-                dc.DrawFocusRect(&fRect);
+        } else {
+                dc.Rectangle(mRect.left, mRect.top, mRect.right, mRect.bottom);
+        }
+
+        if (!ledOnly) {
+
+                connection* masterConnection=player->getMaster()->getConnection(plugin);
+                // hvis denne går til master, så tegner vi connection-panning-fixing:
+                if (masterConnection) {
+                        // draw panning box inside normal box
+                        dc.SelectBrush(getMachinePanningBrush(plugin));
+                        dc.Rectangle(mRect.left+2, mRect.bottom-(10.0*scale), mRect.right-2, mRect.bottom-2);
+            
+                        // and the little pan-slider:
+
+                        RECT pRect;
+                        dc.SelectBrush(panHandleBrush);
+                        getPanSliderRect(masterConnection, &pRect);
+                        dc.Rectangle(&pRect);
+                }
+
+        // draw machine label
+                int fontIndex=(scale/MAX_MACHINE_SCALE)*((float)MAX_MACHINE_FONTS-0.5);
+                CFont prevFont=dc.SelectFont(machineFont[fontIndex]);
+
+                UINT prevAlign=dc.SetTextAlign(TA_CENTER);
+                int prevBkMode=dc.SetBkMode(TRANSPARENT);
+
+
+                string label=plugin->getName();
+                if (player->getSoloMachine()!=0 && player->getSoloMachine()!=plugin)
+                        label="["+label+"]";
+
+                if (plugin->isMuted())
+                        label="("+label+")";
+
+                float fontSize=(scale+1)*8;
+
+                int adjustY=plugin->minimized?-fontSize:0;
+
+                if (skin && skin->skin && !plugin->minimized)
+                        dc.SetTextColor(skin->textColor); else
+                        dc.SetTextColor(0);
+                dc.TextOut(mRect.left+halfWidth, mRect.top+halfHeight-(fontSize/2)+adjustY, label.c_str(), label.length());
+
+
+                if (document->isSelectedMachine(plugin)) {
+                        RECT fRect = mRect;
+                        fRect.left -= 2;
+                        fRect.top -= 2;
+                        fRect.right += 2;
+                        fRect.bottom += 2;
+                        dc.SetTextColor(0);
+                        dc.DrawFocusRect(&fRect);
+                        InflateRect(&fRect, 1, 1);
+                        dc.DrawFocusRect(&fRect);
+                }
+                dc.SetTextAlign(prevAlign);
+                dc.SetBkMode(prevBkMode);
+                dc.SelectFont(prevFont);
         }
 
         dc.SelectPen(oldPen);
         dc.SelectBrush(oldBrush);
-        dc.SetTextAlign(prevAlign);
-        dc.SetBkMode(prevBkMode);
-        dc.SelectFont(prevFont);
 
 }
 
 void CMachineView::paintMachines(CDC& dc) {
-        RECT rc;
-        GetClientRect(&rc);
-        dc.FillSolidRect(0,0, rc.right, rc.bottom, backgroundColor);
 
         CPenHandle oldPen = dc.SelectPen(linePen);

trunk/src/buzelib/MachineView.h

@@ -9 +9 @@
 class CMainFrame;
 class ClientViewListener;
-
-enum MachineViewRedraw {
-        MachineViewBoxes=1,
-        MachineViewStatus=2,
-        MachineViewVolume=4,
-        MachineViewSelectionRectangle=8,
-
-        MachineViewAll=MachineViewBoxes|MachineViewStatus,
-        MachineViewAllSelection=MachineViewBoxes|MachineViewStatus|MachineViewSelectionRectangle
-};
 
 enum MachineViewMouseMoveType {
@@ -38 +28 @@
         ClientViewListener* clientViewListener;
         zzub::player* player;
-        MachineViewRedraw redrawMode;
 
         zzub::metaplugin* draggingMachine;
@@ -77 +66 @@
         CBrush ampHandleBrush;
 
+        bool dirtyMachines, dirtyStatus, dirtySelectionRectangle, dirtyVolumeSlider;
+        bool dirtyOffscreenBitmap;
+        CBitmap offscreenBitmap;
 public:
         double scale;
@@ -88 +80 @@
                 MESSAGE_HANDLER(WM_PAINT, OnPaint)
                 MESSAGE_HANDLER(WM_CHAR, OnChar)
+                MESSAGE_HANDLER(WM_SIZE, OnSize)
                 MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown)
                 MESSAGE_HANDLER(WM_KEYUP, OnKeyUp)
@@ -125 +118 @@
         LRESULT OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
         LRESULT OnFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
         LRESULT OnKeyDown(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
         LRESULT OnKeyUp(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);

trunk/src/buzelib/MainFrm.cpp

@@ -2338 +2338 @@
                 return 0;
         zzub::wave_level* wavelevel = wave->get_level(level);
-        sf_writef_short(sf, (const short*)wave->get_sample_ptr(level), wave->get_sample_count(level));
+        sf_write_raw(sf, wave->get_sample_ptr(level), wave->get_sample_count(level) * ( wave->get_bits_per_sample(level) / 8 * sfinfo.channels ) );
         sf_close(sf); // so close it
         return 1;

trunk/src/buzelib/WaveTableView.cpp

@@ -446 +446 @@
         if (index < 0) return 0;
 
+        if (!document->streamplayer) return 0;
         if (document->isNotePlaying(document->streamplayer, note)) return 0;
 
@@ -457 +458 @@
         if (note == -1) return 0;
 
+        if (!document->streamplayer) return 0;
         document->playMachineNote(document->streamplayer, zzub::note_value_off, note);
         return 0;