- commit
- 89e3b7cd1f8d0b88ca17c60577ac509305a9dad3
- parent
- a94f5455fdd8333bc71f364924800c493f018f80
- Author
- Tobias Bengfort <tobias.bengfort@gmx.net>
- Date
- 2010-11-17 19:03
icons
Diffstat
| M | README | 1 | - |
| M | src/gui/retimer_wx.cpp | 37 | ++++++++++--------------------------- |
| M | src/rbprocess.h | 2 | +- |
| M | xiRetimer | 0 |
4 files changed, 11 insertions, 29 deletions
diff --git a/README b/README
@@ -8,7 +8,6 @@ gui - wxwidgets 8 8 xiRetimer 9 9 timestretch - rubberband (v>=1.5) 10 1011 -112 11 TODO 13 12 smooth interpolation 14 13 libmad
diff --git a/src/gui/retimer_wx.cpp b/src/gui/retimer_wx.cpp
@@ -4,6 +4,7 @@ 4 4 // 5 5 // PLEASE DO "NOT" EDIT THIS FILE! 6 6 /////////////////////////////////////////////////////////////////////////// -1 7 // sorry guys, I edited it 7 8 8 9 #include "retimer_wx.h" 9 10 @@ -24,19 +25,15 @@ wxInitAllImageHandlers(); 24 25 m_file = new wxMenu(); 25 26 wxMenuItem* m_open; 26 27 m_open = new wxMenuItem( m_file, wxID_ANY, wxString( wxT("open") ) + wxT('\t') + wxT("CTRL+f"), wxEmptyString, wxITEM_NORMAL );27 -1 #ifdef __WXMSW__-1 28 #ifdef ICONS_GNOME 28 29 m_open->SetBitmaps( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/fileopen.png"), wxBITMAP_TYPE_ANY ) );29 -1 #elif defined( __WXGTK__ )30 -1 m_open->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/fileopen.png"), wxBITMAP_TYPE_ANY ) );31 30 #endif 32 31 m_file->Append( m_open ); 33 32 34 33 wxMenuItem* m_export; 35 34 m_export = new wxMenuItem( m_file, wxID_ANY, wxString( wxT("export") ) + wxT('\t') + wxT("CTRL+s"), wxEmptyString, wxITEM_NORMAL );36 -1 #ifdef __WXMSW__-1 35 #ifdef ICONS_GNOME 37 36 m_export->SetBitmaps( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/document-save.png"), wxBITMAP_TYPE_ANY ) );38 -1 #elif defined( __WXGTK__ )39 -1 m_export->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/document-save.png"), wxBITMAP_TYPE_ANY ) );40 37 #endif 41 38 m_file->Append( m_export ); 42 39 @@ -45,10 +42,8 @@ wxInitAllImageHandlers(); 45 42 46 43 wxMenuItem* m_prefs; 47 44 m_prefs = new wxMenuItem( m_file, wxID_ANY, wxString( wxT("preferences") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );48 -1 #ifdef __WXMSW__-1 45 #ifdef ICONS_GNOME 49 46 m_prefs->SetBitmaps( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/document-properties.png"), wxBITMAP_TYPE_ANY ) );50 -1 #elif defined( __WXGTK__ )51 -1 m_prefs->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/document-properties.png"), wxBITMAP_TYPE_ANY ) );52 47 #endif 53 48 m_file->Append( m_prefs ); 54 49 @@ -57,10 +52,8 @@ wxInitAllImageHandlers(); 57 52 58 53 wxMenuItem* b_exit; 59 54 b_exit = new wxMenuItem( m_file, wxID_ANY, wxString( wxT("Exit") ) , wxEmptyString, wxITEM_NORMAL );60 -1 #ifdef __WXMSW__-1 55 #ifdef ICONS_GNOME 61 56 b_exit->SetBitmaps( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/window-close.png"), wxBITMAP_TYPE_ANY ) );62 -1 #elif defined( __WXGTK__ )63 -1 b_exit->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/window-close.png"), wxBITMAP_TYPE_ANY ) );64 57 #endif 65 58 m_file->Append( b_exit ); 66 59 @@ -69,19 +62,15 @@ wxInitAllImageHandlers(); 69 62 m_edit = new wxMenu(); 70 63 wxMenuItem* m_play; 71 64 m_play = new wxMenuItem( m_edit, wxID_ANY, wxString( wxT("play/pause") ) + wxT('\t') + wxT("SPACE"), wxEmptyString, wxITEM_NORMAL );72 -1 #ifdef __WXMSW__-1 65 #ifdef ICONS_GNOME 73 66 m_play->SetBitmaps( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/media-playback-start.png"), wxBITMAP_TYPE_ANY ) );74 -1 #elif defined( __WXGTK__ )75 -1 m_play->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/media-playback-start.png"), wxBITMAP_TYPE_ANY ) );76 67 #endif 77 68 m_edit->Append( m_play ); 78 69 79 70 wxMenuItem* m_start; 80 71 m_start = new wxMenuItem( m_edit, wxID_ANY, wxString( wxT("start") ) + wxT('\t') + wxT("CTRL+LEFT"), wxEmptyString, wxITEM_NORMAL );81 -1 #ifdef __WXMSW__-1 72 #ifdef ICONS_GNOME 82 73 m_start->SetBitmaps( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/media-skip-backward.png"), wxBITMAP_TYPE_ANY ) );83 -1 #elif defined( __WXGTK__ )84 -1 m_start->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/media-skip-backward.png"), wxBITMAP_TYPE_ANY ) );85 74 #endif 86 75 m_edit->Append( m_start ); 87 76 @@ -90,19 +79,15 @@ wxInitAllImageHandlers(); 90 79 91 80 wxMenuItem* m_clear; 92 81 m_clear = new wxMenuItem( m_edit, wxID_ANY, wxString( wxT("clear markers") ) + wxT('\t') + wxT("CTRL+c"), wxEmptyString, wxITEM_NORMAL );93 -1 #ifdef __WXMSW__-1 82 #ifdef ICONS_GNOME 94 83 m_clear->SetBitmaps( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/edit-clear.png"), wxBITMAP_TYPE_ANY ) );95 -1 #elif defined( __WXGTK__ )96 -1 m_clear->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/edit-clear.png"), wxBITMAP_TYPE_ANY ) );97 84 #endif 98 85 m_edit->Append( m_clear ); 99 86 100 87 wxMenuItem* m_process; 101 88 m_process = new wxMenuItem( m_edit, wxID_ANY, wxString( wxT("update audio data") ) + wxT('\t') + wxT("CTRL+u"), wxEmptyString, wxITEM_NORMAL );102 -1 #ifdef __WXMSW__-1 89 #ifdef ICONS_GNOME 103 90 m_process->SetBitmaps( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/stock_refresh.png"), wxBITMAP_TYPE_ANY ) );104 -1 #elif defined( __WXGTK__ )105 -1 m_process->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/stock_refresh.png"), wxBITMAP_TYPE_ANY ) );106 91 #endif 107 92 m_edit->Append( m_process ); 108 93 @@ -111,10 +96,8 @@ wxInitAllImageHandlers(); 111 96 m_help = new wxMenu(); 112 97 wxMenuItem* m_about; 113 98 m_about = new wxMenuItem( m_help, wxID_ANY, wxString( wxT("about") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );114 -1 #ifdef __WXMSW__-1 99 #ifdef ICONS_GNOME 115 100 m_about->SetBitmaps( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/help-about.png"), wxBITMAP_TYPE_ANY ) );116 -1 #elif defined( __WXGTK__ )117 -1 m_about->SetBitmap( wxBitmap( wxT("/usr/share/icons/gnome/16x16/actions/help-about.png"), wxBITMAP_TYPE_ANY ) );118 101 #endif 119 102 m_help->Append( m_about ); 120 103
diff --git a/src/rbprocess.h b/src/rbprocess.h
@@ -32,7 +32,7 @@ int RBprocess(int olength, float* data, Marker* marker, Sample* sample, int n=1) 32 32 obuf[0]=data; 33 33 34 34 RubberBand::RubberBandStretcher ts(44100, 1, 0, 1);35 -1 // map // TODO simply todo-1 35 // map 36 36 std::map<unsigned int, unsigned int> fmap; 37 37 for (int i=0; i<length; i+=1024) { 38 38 float old= marker->nnew2new(marker->new2old(i/(float)length));