Merge branch 'stable-0.4' of https://github.com/bhattigurjot/lmms into stable-0.4

2014-01-14 22:02:50 +05:30
parent d4a2e33bf5 7105c8ac90
commit 61ac073cc2
4 changed files with 139 additions and 53 deletions
--- a/include/sample_buffer.h
+++ b/include/sample_buffer.h
@@ -219,6 +219,8 @@ public slots:
 private:
 	void update( bool _keep_settings = false );

+    void convertIntToFloat ( int_sample_t * & _ibuf, f_cnt_t _frames, int _channels);
+    void directFloatWrite ( sample_t * & _fbuf, f_cnt_t _frames, int _channels);

 	f_cnt_t decodeSampleSF( const char * _f, int_sample_t * & _buf,
 						ch_cnt_t & _channels,