projects
/
goodguy
/
history.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d14310
)
ladspa fixes and L_ladspa plugin title, sams icons, mainerror fix
author
Good Guy
<good1.2guy@gmail.com>
Sat, 23 Sep 2017 20:37:15 +0000
(14:37 -0600)
committer
Good Guy
<good1.2guy@gmail.com>
Sat, 23 Sep 2017 20:37:15 +0000
(14:37 -0600)
15 files changed:
cinelerra-5.1/cinelerra/mainerror.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/mwindow.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/pluginaclientlad.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/pluginaclientlad.h
patch
|
blob
|
history
cinelerra-5.1/picon_cinfinity/ff_cropdetect.png
patch
|
blob
|
history
cinelerra-5.1/picon_cinfinity/ff_dejudder.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/picon_cinfinity/ff_delogo.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/picon_cinfinity/ff_deshake.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/picon_cinfinity/ff_dilation.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/picon_cinfinity/ff_drawbox.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/picon_cinfinity/ff_drawgraph.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/picon_cinfinity/ff_drawgrid.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/picon_cinfinity/ff_edgedetect.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/picon_cinfinity/ff_elbg.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/picon_cinfinity/ff_eq.png
[new file with mode: 0644]
patch
|
blob
diff --git
a/cinelerra-5.1/cinelerra/mainerror.C
b/cinelerra-5.1/cinelerra/mainerror.C
index 19169eb778ec972ba37cae87534d11fbe6e9a728..ceeffc4a5ee38378ff0530fe8006bf6a09d7b0ae 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainerror.C
+++ b/
cinelerra-5.1/cinelerra/mainerror.C
@@
-64,15
+64,12
@@
MainErrorGUI::~MainErrorGUI()
void MainErrorGUI::create_objects()
{
void MainErrorGUI::create_objects()
{
-SET_TRACE
BC_Button *button;
add_subwindow(button = new BC_OKButton(this));
int x = 10, y = 10;
BC_Button *button;
add_subwindow(button = new BC_OKButton(this));
int x = 10, y = 10;
-SET_TRACE
add_subwindow(title = new BC_Title(x, y, _("The following errors occurred:")));
y += title->get_h() + 5;
add_subwindow(title = new BC_Title(x, y, _("The following errors occurred:")));
y += title->get_h() + 5;
-SET_TRACE
add_subwindow(list = new BC_ListBox(x,
y,
get_w() - 20,
add_subwindow(list = new BC_ListBox(x,
y,
get_w() - 20,
@@
-87,9
+84,7
@@
SET_TRACE
LISTBOX_SINGLE, // Select one item or multiple items
ICON_LEFT, // Position of icon relative to text of each item
0));
LISTBOX_SINGLE, // Select one item or multiple items
ICON_LEFT, // Position of icon relative to text of each item
0));
-SET_TRACE
show_window();
show_window();
-SET_TRACE
}
int MainErrorGUI::resize_event(int w, int h)
}
int MainErrorGUI::resize_event(int w, int h)
@@
-149,8
+144,7
@@
void MainError::append_error(const char *string)
{
char *out_ptr = string2;
// Indent remaining lines
{
char *out_ptr = string2;
// Indent remaining lines
- if(!first_line)
- {
+ if( !first_line ) {
*out_ptr++ = ' ';
*out_ptr++ = ' ';
}
*out_ptr++ = ' ';
*out_ptr++ = ' ';
}
@@
-164,8
+158,7
@@
void MainError::append_error(const char *string)
errors.append(new BC_ListBoxItem(string2));
errors.append(new BC_ListBoxItem(string2));
- if(*in_ptr == '\n')
- {
+ if( *in_ptr == '\n' ) {
in_ptr++;
first_line = 0;
}
in_ptr++;
first_line = 0;
}
@@
-174,56
+167,36
@@
void MainError::append_error(const char *string)
void MainError::show_error_local(const char *string)
{
void MainError::show_error_local(const char *string)
{
-SET_TRACE
// assume user won't get to closing the GUI here
lock_window("MainError::show_error_local");
// assume user won't get to closing the GUI here
lock_window("MainError::show_error_local");
-SET_TRACE
- if(get_gui())
- {
-SET_TRACE
+ if( get_gui() ) {
MainErrorGUI *gui = (MainErrorGUI*)get_gui();
gui->lock_window("MainError::show_error_local");
MainErrorGUI *gui = (MainErrorGUI*)get_gui();
gui->lock_window("MainError::show_error_local");
-SET_TRACE
append_error(string);
append_error(string);
-SET_TRACE
- gui->list->update(&errors,
- 0,
- 0,
- 1,
- gui->list->get_xposition(),
- gui->list->get_yposition(),
+ gui->list->update(&errors, 0, 0, 1,
+ gui->list->get_xposition(), gui->list->get_yposition(),
gui->list->get_highlighted_item(), // Flat index of item cursor is over
0, // set all autoplace flags to 1
1);
gui->list->get_highlighted_item(), // Flat index of item cursor is over
0, // set all autoplace flags to 1
1);
-SET_TRACE
+ gui->raise_window(1);
gui->unlock_window();
gui->unlock_window();
- unlock_window();
-SET_TRACE
- start();
-SET_TRACE
}
}
- else
- {
- unlock_window();
-SET_TRACE
+ else {
errors.remove_all_objects();
errors.remove_all_objects();
-SET_TRACE
append_error(string);
append_error(string);
-SET_TRACE
start();
start();
-SET_TRACE
}
}
+ unlock_window();
}
void MainError::show_error(const char *string)
{
}
void MainError::show_error(const char *string)
{
- if(
main_error
)
+ if(
main_error
)
main_error->show_error_local(string);
main_error->show_error_local(string);
- else
- {
+ else {
printf("%s", string);
printf("%s", string);
- if(
string[strlen(string) - 1] != '\n'
)
+ if(
string[strlen(string) - 1] != '\n'
)
printf("\n");
}
}
printf("\n");
}
}
diff --git
a/cinelerra-5.1/cinelerra/mwindow.C
b/cinelerra-5.1/cinelerra/mwindow.C
index 7a1f59be404620794446f1b04d478ac996bb23e5..6a639671b125454520b8505b68cd4b70886a08fc 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.C
+++ b/
cinelerra-5.1/cinelerra/mwindow.C
@@
-3313,7
+3313,8
@@
void MWindow::dump_exe(FILE *fp)
char mtime[256];
strftime(mtime, sizeof(mtime), "%F %T", tm);
fprintf(fp,"mtime: %s\n", mtime);
char mtime[256];
strftime(mtime, sizeof(mtime), "%F %T", tm);
fprintf(fp,"mtime: %s\n", mtime);
-
+#if 0
+// people hit ctl-c waiting for this
int fd = open(proc_path,O_RDONLY+O_NONBLOCK);
if( fd < 0 ) { fprintf(fp,"open: %m\n"); return; }
uint8_t *bfr = 0;
int fd = open(proc_path,O_RDONLY+O_NONBLOCK);
if( fd < 0 ) { fprintf(fp,"open: %m\n"); return; }
uint8_t *bfr = 0;
@@
-3338,6
+3339,7
@@
void MWindow::dump_exe(FILE *fp)
for( int i=0; i<20; ++i ) fprintf(fp, "%02x", digest[i]);
if( ret < 0 ) fprintf(fp, " (ret %d)", ret);
if( pos < st.st_size ) fprintf(fp, " (pos %jd)", pos);
for( int i=0; i<20; ++i ) fprintf(fp, "%02x", digest[i]);
if( ret < 0 ) fprintf(fp, " (ret %d)", ret);
if( pos < st.st_size ) fprintf(fp, " (pos %jd)", pos);
+#endif
fprintf(fp, "\n");
}
fprintf(fp, "\n");
}
diff --git
a/cinelerra-5.1/cinelerra/pluginaclientlad.C
b/cinelerra-5.1/cinelerra/pluginaclientlad.C
index 91c19275f7d47305762d2f4754ec94c3c6ca72cf..f6228c3b96d354d1f10559512449aad6160ab336 100644
(file)
--- a/
cinelerra-5.1/cinelerra/pluginaclientlad.C
+++ b/
cinelerra-5.1/cinelerra/pluginaclientlad.C
@@
-69,8
+69,13
@@
int PluginAClientConfig::equivalent(PluginAClientConfig &that)
// Need PluginServer to do this.
void PluginAClientConfig::copy_from(PluginAClientConfig &that)
{
// Need PluginServer to do this.
void PluginAClientConfig::copy_from(PluginAClientConfig &that)
{
- int n = bmin(total_ports, that.total_ports);
- for( int i=0; i<n; ++i ) {
+ if( total_ports != that.total_ports ) {
+ delete_objects();
+ total_ports = that.total_ports;
+ port_data = new LADSPA_Data[total_ports];
+ port_type = new int[total_ports];
+ }
+ for( int i=0; i<total_ports; ++i ) {
port_type[i] = that.port_type[i];
port_data[i] = that.port_data[i];
}
port_type[i] = that.port_type[i];
port_data[i] = that.port_data[i];
}
@@
-348,6
+353,7
@@
PluginAClientLAD::PluginAClientLAD(PluginServer *server)
total_outbuffers = 0;
buffer_allocation = 0;
lad_instance = 0;
total_outbuffers = 0;
buffer_allocation = 0;
lad_instance = 0;
+ snprintf(title, sizeof(title), "L_%s", server->lad_descriptor->Name);
}
PluginAClientLAD::~PluginAClientLAD()
}
PluginAClientLAD::~PluginAClientLAD()
@@
-400,7
+406,7
@@
int PluginAClientLAD::get_outchannels()
const char* PluginAClientLAD::plugin_title()
{
const char* PluginAClientLAD::plugin_title()
{
- return
(char*)server->lad_descriptor->Nam
e;
+ return
titl
e;
}
int PluginAClientLAD::uses_gui()
}
int PluginAClientLAD::uses_gui()
diff --git
a/cinelerra-5.1/cinelerra/pluginaclientlad.h
b/cinelerra-5.1/cinelerra/pluginaclientlad.h
index 489e23d401da6766887acd646c91d0c0881eda1b..4011c2b614f87d17efdf46a904d1364d51a04702 100644
(file)
--- a/
cinelerra-5.1/cinelerra/pluginaclientlad.h
+++ b/
cinelerra-5.1/cinelerra/pluginaclientlad.h
@@
-160,7
+160,7
@@
public:
void read_data(KeyFrame *keyframe);
PLUGIN_CLASS_MEMBERS(PluginAClientConfig)
void read_data(KeyFrame *keyframe);
PLUGIN_CLASS_MEMBERS(PluginAClientConfig)
-
+ char title[BCSTRLEN];
static char* lad_to_string(char *string, const char *input);
static char* lad_to_upper(char *string, const char *input);
static char* lad_to_string(char *string, const char *input);
static char* lad_to_upper(char *string, const char *input);
diff --git
a/cinelerra-5.1/picon_cinfinity/ff_cropdetect.png
b/cinelerra-5.1/picon_cinfinity/ff_cropdetect.png
index 593c40efd5767eec7c6bed8d0aa9dd33995edb1c..32bb792cadd995b9c313a4d7f94c610ac58a5d5b 100644
(file)
Binary files a/cinelerra-5.1/picon_cinfinity/ff_cropdetect.png and b/cinelerra-5.1/picon_cinfinity/ff_cropdetect.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/ff_dejudder.png
b/cinelerra-5.1/picon_cinfinity/ff_dejudder.png
new file mode 100644
(file)
index 0000000..
0df0012
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_dejudder.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/ff_delogo.png
b/cinelerra-5.1/picon_cinfinity/ff_delogo.png
new file mode 100644
(file)
index 0000000..
7bc85c6
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_delogo.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/ff_deshake.png
b/cinelerra-5.1/picon_cinfinity/ff_deshake.png
new file mode 100644
(file)
index 0000000..
e79b8ce
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_deshake.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/ff_dilation.png
b/cinelerra-5.1/picon_cinfinity/ff_dilation.png
new file mode 100644
(file)
index 0000000..
efdef38
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_dilation.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/ff_drawbox.png
b/cinelerra-5.1/picon_cinfinity/ff_drawbox.png
new file mode 100644
(file)
index 0000000..
4751d78
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_drawbox.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/ff_drawgraph.png
b/cinelerra-5.1/picon_cinfinity/ff_drawgraph.png
new file mode 100644
(file)
index 0000000..
4a7cbc3
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_drawgraph.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/ff_drawgrid.png
b/cinelerra-5.1/picon_cinfinity/ff_drawgrid.png
new file mode 100644
(file)
index 0000000..
d883744
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_drawgrid.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/ff_edgedetect.png
b/cinelerra-5.1/picon_cinfinity/ff_edgedetect.png
new file mode 100644
(file)
index 0000000..
d62c412
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_edgedetect.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/ff_elbg.png
b/cinelerra-5.1/picon_cinfinity/ff_elbg.png
new file mode 100644
(file)
index 0000000..
3e69ce8
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_elbg.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/ff_eq.png
b/cinelerra-5.1/picon_cinfinity/ff_eq.png
new file mode 100644
(file)
index 0000000..
013e331
Binary files /dev/null and b/cinelerra-5.1/picon_cinfinity/ff_eq.png differ