Changeset 1294

Timestamp:

10/29/07 23:59:32 (12 months ago)

Author:

calvin

Message:

added edit-tab to wavetable with a volume slider, deleted unused wavetable tab code, moved WtlExt?.h and WTLTabViewCtrl.h out of wtl and into utils directory, ctrl-backspace works in wavetable

Location:

trunk/src

Files:

• buzelib/EnvelopeCtrl.cpp (modified) (1 diff)
• buzelib/Preferences/PreferencesDialog.h (modified) (1 diff)
• buzelib/Utils/WTLTabViewCtrl.h (added)
• buzelib/Utils/WtlExt.h (added)
• buzelib/WaveTableEditTabView.cpp (deleted)
• buzelib/WaveTableEditTabView.h (deleted)
• buzelib/WaveTableRecordTabView.cpp (deleted)
• buzelib/WaveTableRecordTabView.h (deleted)
• buzelib/WaveTableView.cpp (modified) (8 diffs)
• buzelib/WaveTableView.h (modified) (6 diffs)
• wtl/WTLTabViewCtrl.h (deleted)
• wtl/WtlExt.h (deleted)

trunk/src/buzelib/EnvelopeCtrl.cpp

@@ -1 +1 @@
 #include "StdAfx.h"
-#include "WTLExt.h"
+#include "Utils/WTLExt.h"
 #include "EnvelopeCtrl.h"
 

trunk/src/buzelib/Preferences/PreferencesDialog.h

@@ -1 +1 @@
 #pragma once
 
-#include <WTLTabViewCtrl.h>
+#include "../Utils/WTLTabViewCtrl.h"
 
 #include "AudioDriverPreferencesView.h"

trunk/src/buzelib/WaveTableView.cpp

@@ -11 +11 @@
 #include "Utils/utils.h"
 #include "Utils/Keymaps.h"
+#include "Properties.h"
 
 #ifdef min
@@ -23 +24 @@
 using namespace std;
 using namespace zzub;
+
+
+/***
+
+        CWaveTabEdit
+
+***/
+
+CWaveTabEdit::CWaveTabEdit(CWaveTableView* view) {
+        this->view = view;
+}
+
+LRESULT CWaveTabEdit::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+        DefWindowProc();
+
+        volumeSliderLabel.Create(m_hWnd, rcDefault, "Volume", WS_VISIBLE|WS_CHILD);
+        volumeSliderLabel.SetFont((HFONT) GetStockObject( DEFAULT_GUI_FONT ));
+
+        DWORD trackBarStyle = WS_CHILD|WS_VISIBLE|TBS_AUTOTICKS|TBS_FIXEDLENGTH|TBS_BOTH;
+
+        volumeSlider.Create(m_hWnd, rcDefault, 0, trackBarStyle );
+        volumeSlider.SetPageSize(16);
+        volumeSlider.SetTicFreq(1024);
+        volumeSlider.SetRange(0, 0x7fff);       // converted to a float between from 0-2 (0-200%)
+        volumeSlider.SetThumbLength(12);
+
+        updateFromWavetable();
+
+        return 0;
+}
+
+LRESULT CWaveTabEdit::OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
+        WORD cx = LOWORD( lParam);
+        WORD cy = HIWORD( lParam);
+
+        volumeSliderLabel.MoveWindow(0, 0, cx, 22);
+        
+        volumeSlider.MoveWindow(0, 22, cx, 22);
+
+        return 0;
+}
+
+LRESULT CWaveTabEdit::OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+        return 0;
+}
+
+LRESULT CWaveTabEdit::OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+        return 0;
+}
+
+LRESULT CWaveTabEdit::OnHScroll(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+        wave_info_ex* wave = view->getSelectedWave();
+        wave->volume = (float)volumeSlider.GetPos() / 0x7fff * 2;
+        updateFromWavetable();
+        return 0;
+}
+
+LRESULT CWaveTabEdit::OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
+        CDCHandle bgDC((HDC)wParam);
+        RECT rcClient;
+        GetClientRect(&rcClient);
+        bgDC.FillRect(&rcClient, COLOR_3DFACE);
+        return 1;
+}
+
+void CWaveTabEdit::updateFromWavetable() {
+        wave_info_ex* wave = view->getSelectedWave();
+        if (!wave) return ;
+        
+        volumeSlider.SetPos(wave->volume / 2 * 0x7fff);
+
+        std::stringstream strm;
+        strm << "Volume (" << int(wave->volume * 100) << "%)";
+        volumeSliderLabel.SetWindowText(strm.str().c_str());
+}
 
 /***
@@ -188 +264 @@
         updateEnvelope();
         return 0;
+}
+
+/***
+
+        CBgTabViewCtrl
+
+***/
+
+
+LRESULT CBgTabViewCtrl::OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
+        CDCHandle bgDC((HDC)wParam);
+        RECT rcClient;
+        GetClientRect(&rcClient);
+        bgDC.FillRect(&rcClient, COLOR_3DFACE);
+        return DefWindowProc();
 }
 
@@ -204 +295 @@
         ,envelopeTab(this)
         ,editTab(this)
-        ,recordTab(this)
 {
         player = mainFrm->player;
@@ -250 +340 @@
         waveEditorCtrl.Create(waveTabSplitter, rcDefault, 0, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS |WS_CLIPCHILDREN | WS_HSCROLL, WS_EX_CLIENTEDGE, IDC_FILELIST);
 
-        waveTabs.Create(waveTabSplitter, rcDefault, 0, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN, 0, IDC_WAVETABS);
-
-        //editTab.Create(waveTabs);//, rcDefault, 0, WS_CHILD);
-        //waveTabs.AddTab("Edit", editTab);
+        waveTabs.Create(waveTabSplitter, rcDefault, 0, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN |TCS_TABS, 0, IDC_WAVETABS);
+
+        editTab.Create(waveTabs, rcDefault, 0, WS_CHILD);
+        waveTabs.AddTab("Edit", editTab);
 
         envelopeTab.Create(waveTabs, rcDefault, 0, WS_CHILD);
@@ -493 +583 @@
         mainFrame->document->selectWave(entry);
 
+        editTab.updateFromWavetable();
 }
 
@@ -661 +752 @@
 }
 
-LRESULT CWaveTableView::OnTcnSelchangeWavetab(int /*idCtrl*/, LPNMHDR pNMHDR, BOOL& /*bHandled*/) {
-        waveTabs.SetActiveTab(waveTabs.GetCurSel());
-        return 0;
-}
-
 LRESULT CWaveTableView::OnZoomSamples(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& bHandled) {
         waveEditorCtrl.gridType=WaveEditorSamples;
@@ -748 +834 @@
 LRESULT CWaveTableView::OnViewProperties(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
         // properties på wavelevel eller properties på wave?
+
+        if (document->selectedPropertyProvider) delete document->selectedPropertyProvider;
+        document->selectedPropertyProvider = new CWavePropertyProvider(*this, document, getSelectedWave());
+        document->updateAllViews(0, UpdateProperties);
         return 0;
 }

trunk/src/buzelib/WaveTableView.h

@@ -2 +2 @@
 
 #include <stack>
-#include <WTLTabViewCtrl.h>
 #include "FileBrowserList.h"
 #include "WaveTableList.h"
-#include "WtlExt.h"
+#include "Utils/WtlExt.h"
 #include "EnvelopeCtrl.h"
 #include "WaveEntryList.h"
 #include "WaveEditorCtrl.h"
 #include "Utils/ToolbarWindow.h"
-#include "WaveTableRecordTabView.h"
-#include "WaveTableEditTabView.h"
 #include "Utils/SplitterWindowKey.h"
+#include "Utils/WTLTabViewCtrl.h"
 
 class CWaveTableView;
@@ -18 +16 @@
 
 const int IDC_WAVETABS = 666;
+const int IDC_WAVEVOLUMESLIDER = 667;
+
+class CWaveTabEdit : public CWindowImpl<CWaveTabEdit> {
+        CWaveTableView* view;
+public:
+        CWaveTabEdit(CWaveTableView* view);
+
+        CStatic volumeSliderLabel;
+        CTrackBarCtrl volumeSlider;
+
+        DECLARE_WND_CLASS("WaveTabEdit")
+
+        BEGIN_MSG_MAP(CWaveTabEdit)
+                MESSAGE_HANDLER(WM_CREATE, OnCreate)
+                MESSAGE_HANDLER(WM_SIZE, OnSize)
+                MESSAGE_HANDLER(WM_CLOSE, OnClose)
+                MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
+
+                MESSAGE_HANDLER(WM_HSCROLL, OnHScroll)
+                MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground);
+        END_MSG_MAP()
+
+        LRESULT OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnHScroll(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+        void updateFromWavetable();
+};
 
 class CWaveTabEnvelope : public CWindowImpl<CWaveTabEnvelope> {
@@ -61 +90 @@
 };
 
+// Apparently, having a CTabCtrl inside a splitter causes drawing problems with 
+// XP themes where the tab header background isnt cleared properly.
+// We create a CBgTabViewVtrl class that derives from our previous tab control 
+// and implement WM_ERASEBKGND to get around the problem:
+
+class CBgTabViewCtrl : public CWTLTabViewCtrlT< CBgTabViewCtrl> {
+public:
+        BEGIN_MSG_MAP(CBgTabViewCtrl)
+                MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground);
+                CHAIN_MSG_MAP(CWTLTabViewCtrlT< CBgTabViewCtrl>)
+        END_MSG_MAP()
+        LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+};
 
 class CWaveTableView 
@@ -68 +110 @@
 {
         ClientViewListener* clientViewListener;
-        CTrackBarCtrl waveVolumeSlider;
         CWaveEntryList waveEntryList;
         CWaveEditorCtrl waveEditorCtrl;
@@ -84 +125 @@
 public:
         CWaveTableList waveTableList;
-        CWTLTabViewCtrl waveTabs;
-        CWaveTableEditTabView editTab;
+        CBgTabViewCtrl waveTabs;
+        CWaveTabEdit editTab;
         CWaveTabEnvelope envelopeTab;
-        CWaveTableRecordTabView recordTab;
 
         CMainFrame* mainFrame;
@@ -141 +181 @@
                 COMMAND_ID_HANDLER(ID_WAVE_ZOOM_ALL, OnZoomAll)
 
-                NOTIFY_HANDLER(IDC_WAVETABS, TCN_SELCHANGE, OnTcnSelchangeWavetab)
-
                 // From CWTLTabViewCtrl: 
                 // Parent windows must have REFLECT_NOTIFICATIONS() in the message map
                 // to pass along the TCN_SELCHANGE message to 
+                REFLECT_NOTIFICATIONS()
         END_MSG_MAP()