Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 128351 | Differences between
and this patch

Collapse All | Expand All

(-)cheesetracker-0.9.9.old/cheesetracker/interface__QT/interface.cpp (-8 / +8 lines)
Lines 42-48 Link Here
42
#include <qmessagebox.h>
42
#include <qmessagebox.h>
43
43
44
44
45
Saver::Error  Interface::save_song() {
45
Audio::Saver::Error  Interface::save_song() {
46
46
47
	FILE *f=fopen(tracker.song.variables.filename.c_str(),"rb");
47
	FILE *f=fopen(tracker.song.variables.filename.c_str(),"rb");
48
	if (!f) { //file doesnt exist, cant do direct save
48
	if (!f) { //file doesnt exist, cant do direct save
Lines 53-66 Link Here
53
        if (tracker.format_manager.save_module(tracker.song.variables.filename.c_str())) {
53
        if (tracker.format_manager.save_module(tracker.song.variables.filename.c_str())) {
54
54
55
		QMessageBox::warning( this, "Oops!","Error saving song!","Ok");
55
		QMessageBox::warning( this, "Oops!","Error saving song!","Ok");
56
		return Saver::SAVE_ERROR;
56
		return Audio::Saver::SAVE_ERROR;
57
	}
57
	}
58
58
59
	return Saver::SAVE_OK;
59
	return Audio::Saver::SAVE_OK;
60
60
61
}
61
}
62
62
63
Saver::Error  Interface::save_song_as() {
63
Audio::Saver::Error  Interface::save_song_as() {
64
64
65
	QString s=QString::null;
65
	QString s=QString::null;
66
66
Lines 87-93 Link Here
87
87
88
88
89
	if (s==QString::null)
89
	if (s==QString::null)
90
		return Saver::SAVE_OK; //nothing selected
90
		return Audio::Saver::SAVE_OK; //nothing selected
91
91
92
92
93
93
Lines 97-115 Link Here
97
		if ( QMessageBox::warning( this, "Question:","File exists! Overwrite?","Yes", "No") ) {
97
		if ( QMessageBox::warning( this, "Question:","File exists! Overwrite?","Yes", "No") ) {
98
98
99
//			//printf("Leaving file alone!\n");
99
//			//printf("Leaving file alone!\n");
100
			return Saver::SAVE_OK;
100
			return Audio::Saver::SAVE_OK;
101
		}
101
		}
102
	}
102
	}
103
103
104
        if (tracker.format_manager.save_module(s.ascii())) {
104
        if (tracker.format_manager.save_module(s.ascii())) {
105
105
106
		QMessageBox::warning( this, "Oops!","Error saving song!","Ok");
106
		QMessageBox::warning( this, "Oops!","Error saving song!","Ok");
107
		return Saver::SAVE_ERROR;
107
		return Audio::Saver::SAVE_ERROR;
108
	}
108
	}
109
109
110
	tracker.song.variables.filename=s.ascii();
110
	tracker.song.variables.filename=s.ascii();
111
111
112
	return Saver::SAVE_OK;
112
	return Audio::Saver::SAVE_OK;
113
}
113
}
114
114
115
string Interface::get_song_name() {
115
string Interface::get_song_name() {
(-)cheesetracker-0.9.9.old/cheesetracker/interface__QT/interface.h (-2 / +2 lines)
Lines 112-119 Link Here
112
	PageList get_current_page();
112
	PageList get_current_page();
113
113
114
	Loader::Error  open_song(string p_name);
114
	Loader::Error  open_song(string p_name);
115
	Saver::Error  save_song();
115
	Audio::Saver::Error  save_song();
116
	Saver::Error  save_song_as();
116
	Audio::Saver::Error  save_song_as();
117
117
118
118
119
    Interface(QWidget *p_widget);
119
    Interface(QWidget *p_widget);
(-)cheesetracker-0.9.9.old/cheesetracker/savers/saver_ct.h (+2 lines)
Lines 15-20 Link Here
15
#include "trackercore/saver.h"
15
#include "trackercore/saver.h"
16
#include "components/audio/dds_helpers.h"
16
#include "components/audio/dds_helpers.h"
17
17
18
using namespace Audio;
19
18
/**
20
/**
19
@author Juan Linietsky
21
@author Juan Linietsky
20
*/
22
*/
(-)cheesetracker-0.9.9.old/cheesetracker/savers/saver_it.h (-1 / +1 lines)
Lines 51-57 Link Here
51
********************************/
51
********************************/
52
52
53
53
54
54
using namespace Audio;
55
55
56
56
57
class Saver_IT : public Saver {
57
class Saver_IT : public Saver {
(-)cheesetracker-0.9.9.old/cheesetracker/savers/saver_raw.h (-1 / +1 lines)
Lines 42-48 Link Here
42
  *@author red
42
  *@author red
43
  */
43
  */
44
44
45
45
using namespace Audio;
46
46
47
47
48
class Saver_Raw : public Saver  {
48
class Saver_Raw : public Saver  {
(-)cheesetracker-0.9.9.old/cheesetracker/savers/saver_wav.h (-1 / +1 lines)
Lines 39-45 Link Here
39
  *@author red
39
  *@author red
40
  */
40
  */
41
41
42
42
using namespace Audio;
43
43
44
44
45
class Saver_Wav : public Saver  {
45
class Saver_Wav : public Saver  {
(-)cheesetracker-0.9.9.old/cheesetracker/trackercore/file_format_manager.cpp (-8 / +8 lines)
Lines 35-41 Link Here
35
35
36
#include "file_format_manager.h"
36
#include "file_format_manager.h"
37
37
38
38
using namespace Audio;
39
39
40
40
41
File_Format_Manager::File_Format_Manager(){
41
File_Format_Manager::File_Format_Manager(){
Lines 78-84 Link Here
78
	return temperr;
78
	return temperr;
79
}
79
}
80
80
81
void File_Format_Manager::register_saver(Saver *p_saver) {
81
void File_Format_Manager::register_saver(Audio::Saver *p_saver) {
82
82
83
	if (song==NULL) {
83
	if (song==NULL) {
84
84
Lines 93-103 Link Here
93
int File_Format_Manager::save_module(const char *p_filename) {
93
int File_Format_Manager::save_module(const char *p_filename) {
94
	
94
	
95
	Saver_List::const_iterator I;
95
	Saver_List::const_iterator I;
96
	int temperr=Saver::UNKNOWN_TYPE;
96
	int temperr=Audio::Saver::UNKNOWN_TYPE;
97
97
98
	for (I=saver_list.begin();I!=saver_list.end();I++) {
98
	for (I=saver_list.begin();I!=saver_list.end();I++) {
99
99
100
		if ((temperr=(*I)->save(p_filename))!=Saver::UNKNOWN_TYPE) {
100
		if ((temperr=(*I)->save(p_filename))!=Audio::Saver::UNKNOWN_TYPE) {
101
101
102
				return temperr;
102
				return temperr;
103
		}
103
		}
Lines 109-119 Link Here
109
int File_Format_Manager::save_sample(const char *p_filename, int p_index) {
109
int File_Format_Manager::save_sample(const char *p_filename, int p_index) {
110
110
111
	Saver_List::const_iterator I;
111
	Saver_List::const_iterator I;
112
	int temperr=Saver::UNKNOWN_TYPE;
112
	int temperr=Audio::Saver::UNKNOWN_TYPE;
113
113
114
	for (I=saver_list.begin();I!=saver_list.end();I++) {
114
	for (I=saver_list.begin();I!=saver_list.end();I++) {
115
115
116
		if ((temperr=(*I)->save_sample(p_filename,p_index))!=Saver::UNKNOWN_TYPE) {
116
		if ((temperr=(*I)->save_sample(p_filename,p_index))!=Audio::Saver::UNKNOWN_TYPE) {
117
117
118
				return temperr;
118
				return temperr;
119
		}
119
		}
Lines 124-134 Link Here
124
int File_Format_Manager::save_instrument(const char *p_filename, int p_index) {
124
int File_Format_Manager::save_instrument(const char *p_filename, int p_index) {
125
125
126
	Saver_List::const_iterator I;
126
	Saver_List::const_iterator I;
127
	int temperr=Saver::UNKNOWN_TYPE;
127
	int temperr=Audio::Saver::UNKNOWN_TYPE;
128
128
129
	for (I=saver_list.begin();I!=saver_list.end();I++) {
129
	for (I=saver_list.begin();I!=saver_list.end();I++) {
130
130
131
		if ((temperr=(*I)->save_instrument(p_filename,p_index))!=Saver::UNKNOWN_TYPE) {
131
		if ((temperr=(*I)->save_instrument(p_filename,p_index))!=Audio::Saver::UNKNOWN_TYPE) {
132
132
133
				return temperr;
133
				return temperr;
134
		}
134
		}
(-)cheesetracker-0.9.9.old/cheesetracker/trackercore/file_format_manager.h (-2 / +2 lines)
Lines 60-66 Link Here
60
class File_Format_Manager {
60
class File_Format_Manager {
61
61
62
	typedef list<Loader*> Loader_List;
62
	typedef list<Loader*> Loader_List;
63
	typedef list<Saver*> Saver_List;
63
	typedef list<Audio::Saver*> Saver_List;
64
64
65
	Loader_List loader_list;
65
	Loader_List loader_list;
66
	Saver_List saver_list;
66
	Saver_List saver_list;
Lines 80-86 Link Here
80
80
81
        Loader* load_sample_library(const char *p_filename); // Usually, from an instrument, but soundfonds would be cool!
81
        Loader* load_sample_library(const char *p_filename); // Usually, from an instrument, but soundfonds would be cool!
82
82
83
	void register_saver(Saver *p_saver);
83
	void register_saver(Audio::Saver *p_saver);
84
        int save_module(const char *p_filename);
84
        int save_module(const char *p_filename);
85
85
86
	int save_sample(const char *p_filename, int p_index);
86
	int save_sample(const char *p_filename, int p_index);
(-)cheesetracker-0.9.9.old/cheesetracker/trackercore/saver.h (-2 / +2 lines)
Lines 53-59 Link Here
53
53
54
54
55
55
56
56
namespace Audio{
57
class Saver {
57
class Saver {
58
protected:
58
protected:
59
	Song *song;
59
	Song *song;
Lines 78-84 Link Here
78
	Saver();
78
	Saver();
79
	virtual ~Saver();
79
	virtual ~Saver();
80
};
80
};
81
81
}
82
82
83
83
84
#endif
84
#endif
(-)cheesetracker-0.9.9.old/common/components/audio/resampler_manager.h (-1 / +1 lines)
Lines 34-40 Link Here
34
34
35
public:
35
public:
36
36
37
	static Resampler_Manager * Resampler_Manager::get_resampler_manager();
37
	static Resampler_Manager * get_resampler_manager();
38
	int get_resampler_count();
38
	int get_resampler_count();
39
	Resampler * get_resampler(int p_index);
39
	Resampler * get_resampler(int p_index);
40
40
(-)cheesetracker-0.9.9.old/common/components/data/property_bridges.h (-1 / +1 lines)
Lines 41-47 Link Here
41
  */
41
  */
42
42
43
  #define BRIDGE_COPY_VALUE(T) \
43
  #define BRIDGE_COPY_VALUE(T) \
44
	virtual bool T::copy_value(const Property_Bridge& rvalue) {\
44
	virtual bool copy_value(const Property_Bridge& rvalue) {\
45
		T* rcast = dynamic_cast<T*>((T*)&rvalue);\
45
		T* rcast = dynamic_cast<T*>((T*)&rvalue);\
46
		if (rcast) {\
46
		if (rcast) {\
47
			set(rcast->get());\
47
			set(rcast->get());\
(-)cheesetracker-0.9.9.old/common/drivers/posix/sound_driver_jack.h (-1 / +1 lines)
Lines 72-78 Link Here
72
72
73
	int jack_callback_nframes;
73
	int jack_callback_nframes;
74
74
75
	Sound_Driver::Status Sound_Driver_JACK::process();
75
	Sound_Driver::Status process();
76
76
77
        static int process_jack_callback(jack_nframes_t nframes,void *arg);
77
        static int process_jack_callback(jack_nframes_t nframes,void *arg);
78
        static int jack_set_mixfreq(jack_nframes_t nframes,void *arg);
78
        static int jack_set_mixfreq(jack_nframes_t nframes,void *arg);

Return to bug 128351