|
446
|
1 |
--- kino-1.1.1/src/kino_common.cc.orig 2007-09-04 17:16:43.331062469 +0700
|
|
|
2 |
+++ kino-1.1.1/src/kino_common.cc 2007-09-04 17:21:02.180122053 +0700
|
|
|
3 |
@@ -32,6 +32,12 @@
|
|
|
4 |
#include <sys/types.h>
|
|
|
5 |
#include <sys/wait.h>
|
|
|
6 |
#include <dirent.h>
|
|
|
7 |
+#ifdef HAVE_SIGNAL_H
|
|
|
8 |
+#include <signal.h>
|
|
|
9 |
+#endif
|
|
|
10 |
+#ifdef HAVE_LIBGEN_H
|
|
|
11 |
+#include <libgen.h>
|
|
|
12 |
+#endif
|
|
|
13 |
#ifndef _GNU_SOURCE
|
|
|
14 |
#define _GNU_SOURCE
|
|
|
15 |
#endif
|
|
|
16 |
@@ -1701,7 +1707,7 @@
|
|
|
17 |
|
|
|
18 |
|
|
|
19 |
snprintf( s, 2048, _( "%s\n%s\n%2.2d:%2.2d:%2.2d:%2.2d\n%s\n%d bit, %d KHz, %d samples\n%d x %d, %s, %s, %2.2f fps" ),
|
|
|
20 |
- basename( media->GetFilename().c_str() ),
|
|
|
21 |
+ basename((char *)media->GetFilename().c_str() ),
|
|
|
22 |
frame.GetRecordingDate().c_str(),
|
|
|
23 |
tc.hour, tc.min, tc.sec, tc.frame,
|
|
|
24 |
format.c_str(),
|
|
|
25 |
@@ -2457,7 +2463,7 @@
|
|
|
26 |
{
|
|
|
27 |
std::ostringstream ss;
|
|
|
28 |
ss << "_" << count << ". "
|
|
|
29 |
- << StringUtils::replaceAll( basename( ( *i ).c_str() ), "_", "__" )
|
|
|
30 |
+ << StringUtils::replaceAll((char *)basename((char *)( *i ).c_str() ), "_", "__" )
|
|
|
31 |
<< std::ends;
|
|
|
32 |
GtkWidget* widget = gtk_menu_item_new_with_mnemonic( ss.str().c_str() );
|
|
|
33 |
g_signal_connect( G_OBJECT( widget ), "activate", G_CALLBACK( on_open_recent_activate ), gpointer( (*i).c_str() ) );
|